GitLab

# Conflicts:
#	src/de/tud/kom/p2psim/impl/topology/movement/modularosm/ModularMovementModel.java
#	src/de/tud/kom/p2psim/impl/topology/movement/modularosm/ModularMovementModelViz.java

+ Added a server
+ Basic communication protocol
+ Basic attraction point

- Attraction Points with weights and radii
- Local movement with correct speed in scaled scenarios
- New weighted transition strategy for local movement

+ Added a new transition strategy for social movement where destinations must be manually assigned or the nodes won't move.
+ Made it possible to specify a visualisation class for the ModularMovement.
+ Added a visualisation class which allows it to use icons for the nodes.

- add default visualization for nodes, can be disabled via
TopologyViewVis
- updated node and attraction point visualization within the modular
movement model (provides custom menu)

Merge branch 'master' of git@dev.kom.e-technik.tu-darmstadt.de:simonstrator/simonstrator-peerfactsim.git

fiveGTopologyView

Clone currentView -graph in DefaultTopologyComponent. getLocalView, so each requester receives a different object

Prevents several Requesters from receiving the very same Graph object.

When several instances request a `SiSTypes.NEIGHBORS_WIFI` object or otherwise access `DefautlTopologyComponent.getLocalView()` at the same time, i.e., before any changes to the underlay occur, they would receive the same snapshot object.

Changes to this object, like `getLocalView(nodeID, hopcount)`, `addElement` or `removeElement` would alter the graph at every receiver.

See merge request !1

- removed obsolete and duplicate modular movement classes (check your
config-files, you might need to replace "modular" with "modularosm" in
some cases

Merge remote-tracking branch 'origin/master'

Merge nr/monitoring clemens into master

- added possibility to "destroy" cells in 5GTopologyDatabase and 5GVis using SHIFT + Left-Click - default FALSE
- added default black circle for drawing of nodes
- added differentiation for Mouse-Click, -Drag, -Release etc.
- deleted timoutcollections as they seem to be unused and are in overlays with initial behavior of Leo Nobach and extended by Nils Richerzhagen and Clemens Krug. Will be merged next.

See merge request !42

- configurable refresh interval
- configurable visibility of inactive nodeInfo nodes
- fixes for optional simCtrl-panel (right)

Merge Master into nr/monitoring-clemens



See merge request !41

5GTopology.

Merge branch 'master' of dev.kom.e-technik.tu-darmstadt.de:simonstrator/simonstrator-peerfactsim

Include new movement model

Br/pubsub zobel

Merge my own branch with the Street Movement Model into master branch for further work.

See merge request !40