Merge branch 'master' into 'nr/master-debug'

Merge Master into nr/master-debug See merge request !21

Merge branch 'master' into 'nr/master-debug'
Merge Master into nr/master-debug See merge request !21
02dda393 · Nils Richerzhagen · c9a213fb · b1ae37ae · 02dda393 · 02dda393
Commit 02dda393 authored Nov 23, 2015 by Nils Richerzhagen
--- a/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/README.md
+++ b/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/README.md
--- a/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/attraction/AttractionPoint.java
+++ b/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/attraction/AttractionPoint.java
--- a/src/de/tud/kom/p2psim/impl/topology/Topology.java
+++ b/src/de/tud/kom/p2psim/impl/topology/Topology.java
--- a/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/attraction/JSONAttractionGenerator.java
+++ b/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/attraction/JSONAttractionGenerator.java
--- a/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/attraction/OnlineJSONAttractionGenerator.java
+++ b/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/attraction/OnlineJSONAttractionGenerator.java
--- a/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/mapvisualization/IMapVisualization.java
+++ b/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/mapvisualization/IMapVisualization.java
--- a/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/mapvisualization/ShowGoogleMapsMapViz.java
+++ b/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/mapvisualization/ShowGoogleMapsMapViz.java
--- a/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/mapvisualization/ShowMapQuestMapViz.java
+++ b/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/mapvisualization/ShowMapQuestMapViz.java
--- a/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/transition/FixedAssignmentStrategy.java
+++ b/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/transition/FixedAssignmentStrategy.java
--- a/src/de/tud/kom/p2psim/api/common/Position.java
+++ b/src/de/tud/kom/p2psim/api/common/Position.java
--- a/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/transition/SocialTransitionStrategy.java
+++ b/src/de/tud/kom/p2psim/impl/topology/movement/modularosm/transition/SocialTransitionStrategy.java
--- a/src/de/tud/kom/p2psim/impl/topology/obstacles/PolygonObstacle.java
+++ b/src/de/tud/kom/p2psim/impl/topology/obstacles/PolygonObstacle.java
--- a/src/de/tud/kom/p2psim/impl/topology/views/AbstractTopologyView.java
+++ b/src/de/tud/kom/p2psim/impl/topology/views/AbstractTopologyView.java
--- a/src/de/tud/kom/p2psim/impl/topology/views/DefaultLink.java
+++ b/src/de/tud/kom/p2psim/impl/topology/views/DefaultLink.java
--- a/src/de/tud/kom/p2psim/impl/topology/views/FiveGTopologyView.java
+++ b/src/de/tud/kom/p2psim/impl/topology/views/FiveGTopologyView.java
--- a/src/de/tud/kom/p2psim/impl/topology/views/RangedLink.java
+++ b/src/de/tud/kom/p2psim/impl/topology/views/RangedLink.java
--- a/src/de/tud/kom/p2psim/impl/topology/views/RangedTopologyView.java
+++ b/src/de/tud/kom/p2psim/impl/topology/views/RangedTopologyView.java
--- a/src/de/tud/kom/p2psim/impl/topology/views/VisualizationTopologyView.java
+++ b/src/de/tud/kom/p2psim/impl/topology/views/VisualizationTopologyView.java
--- a/src/de/tud/kom/p2psim/impl/topology/views/droprate/PingERDropRate.java
+++ b/src/de/tud/kom/p2psim/impl/topology/views/droprate/PingERDropRate.java
--- a/src/de/tud/kom/p2psim/impl/topology/views/droprate/StaticDropRate.java
+++ b/src/de/tud/kom/p2psim/impl/topology/views/droprate/StaticDropRate.java