Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Simonstrator
PeerfactSim.KOM
Commits
c3ef5c28
Commit
c3ef5c28
authored
Sep 07, 2018
by
Julian Zobel
Browse files
Cleaned up the topology package for better sorting of classes
parent
179aa249
Changes
100
Show whitespace changes
Inline
Side-by-side
src/de/tud/kom/p2psim/impl/topology/obstacles/PolygonObstacle.java
View file @
c3ef5c28
...
...
@@ -32,7 +32,7 @@ import com.vividsolutions.jts.geom.LineString;
import
com.vividsolutions.jts.geom.MultiLineString
;
import
com.vividsolutions.jts.geom.Polygon
;
import
de.tud.kom.p2psim.impl.topology.PositionVector
;
import
de.tud.kom.p2psim.impl.topology.
util.
PositionVector
;
/**
* This Obstacle is build from a list of coordinates that form a Polygon. The
...
...
src/de/tud/kom/p2psim/impl/topology/obstacles/ToggleableDefaultObstacleModel.java
View file @
c3ef5c28
...
...
@@ -27,7 +27,7 @@ import com.google.common.collect.Lists;
import
de.tud.kom.p2psim.api.topology.TopologyComponent
;
import
de.tud.kom.p2psim.api.topology.obstacles.Obstacle
;
import
de.tud.kom.p2psim.api.topology.obstacles.ObstacleModel
;
import
de.tud.kom.p2psim.impl.topology.PositionVector
;
import
de.tud.kom.p2psim.impl.topology.
util.
PositionVector
;
import
de.tudarmstadt.maki.simonstrator.api.Host
;
import
de.tudarmstadt.maki.simonstrator.api.component.ComponentNotAvailableException
;
import
de.tudarmstadt.maki.simonstrator.api.component.HostComponent
;
...
...
src/de/tud/kom/p2psim/impl/topology/placement/BonnMotionPositionDistribution.java
View file @
c3ef5c28
...
...
@@ -31,7 +31,7 @@ import java.util.Vector;
import
java.util.zip.GZIPInputStream
;
import
de.tud.kom.p2psim.impl.simengine.Simulator
;
import
de.tud.kom.p2psim.impl.topology.PositionVector
;
import
de.tud.kom.p2psim.impl.topology.
util.
PositionVector
;
public
class
BonnMotionPositionDistribution
extends
PositionDistribution
{
...
...
src/de/tud/kom/p2psim/impl/topology/placement/CenterPlacement.java
View file @
c3ef5c28
...
...
@@ -22,7 +22,7 @@ package de.tud.kom.p2psim.impl.topology.placement;
import
de.tud.kom.p2psim.api.topology.TopologyComponent
;
import
de.tud.kom.p2psim.api.topology.placement.PlacementModel
;
import
de.tud.kom.p2psim.impl.topology.PositionVector
;
import
de.tud.kom.p2psim.impl.topology.
util.
PositionVector
;
/**
* Places components in the middle of the map
...
...
src/de/tud/kom/p2psim/impl/topology/placement/ConfigurableGridPositionDistribution.java
View file @
c3ef5c28
...
...
@@ -30,7 +30,7 @@ import java.util.Vector;
import
de.tud.kom.p2psim.api.topology.TopologyComponent
;
import
de.tud.kom.p2psim.api.topology.placement.PlacementModel
;
import
de.tud.kom.p2psim.impl.topology.PositionVector
;
import
de.tud.kom.p2psim.impl.topology.
util.
PositionVector
;
import
de.tudarmstadt.maki.simonstrator.api.Randoms
;
/**
...
...
src/de/tud/kom/p2psim/impl/topology/placement/CsvPlacement.java
View file @
c3ef5c28
...
...
@@ -30,8 +30,8 @@ import java.util.Vector;
import
de.tud.kom.p2psim.api.topology.TopologyComponent
;
import
de.tud.kom.p2psim.api.topology.placement.PlacementModel
;
import
de.tud.kom.p2psim.impl.network.modular.common.GeoToolkit
;
import
de.tud.kom.p2psim.impl.topology.ExtendedPositionVector
;
import
de.tud.kom.p2psim.impl.topology.PositionVector
;
import
de.tud.kom.p2psim.impl.topology.
util.
ExtendedPositionVector
;
import
de.tud.kom.p2psim.impl.topology.
util.
PositionVector
;
import
de.tudarmstadt.maki.simonstrator.api.util.XMLConfigurableConstructor
;
/**
...
...
src/de/tud/kom/p2psim/impl/topology/placement/GNPPlacement.java
View file @
c3ef5c28
...
...
@@ -27,8 +27,8 @@ import de.tud.kom.p2psim.api.topology.TopologyComponent;
import
de.tud.kom.p2psim.api.topology.placement.PlacementModel
;
import
de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB
;
import
de.tud.kom.p2psim.impl.network.modular.st.positioning.GNPPositioning.GNPPosition
;
import
de.tud.kom.p2psim.impl.topology.PositionVector
;
import
de.tud.kom.p2psim.impl.topology.TopologyFactory
;
import
de.tud.kom.p2psim.impl.topology.util.PositionVector
;
/**
* Adapter to use the GNP-Positioning in the Topology-Components.
...
...
src/de/tud/kom/p2psim/impl/topology/placement/GridPositionDistribution.java
View file @
c3ef5c28
...
...
@@ -26,7 +26,7 @@ import java.util.Vector;
import
de.tud.kom.p2psim.api.topology.TopologyComponent
;
import
de.tud.kom.p2psim.api.topology.placement.PlacementModel
;
import
de.tud.kom.p2psim.impl.topology.PositionVector
;
import
de.tud.kom.p2psim.impl.topology.
util.
PositionVector
;
import
de.tudarmstadt.maki.simonstrator.api.Randoms
;
/**
...
...
src/de/tud/kom/p2psim/impl/topology/placement/JSONPlacement.java
View file @
c3ef5c28
...
...
@@ -33,8 +33,8 @@ import org.json.JSONObject;
import
de.tud.kom.p2psim.api.topology.TopologyComponent
;
import
de.tud.kom.p2psim.api.topology.placement.PlacementModel
;
import
de.tud.kom.p2psim.impl.topology.PositionVector
;
import
de.tud.kom.p2psim.impl.topology.movement.modularosm.GPSCalculation
;
import
de.tud.kom.p2psim.impl.topology.util.PositionVector
;
/**
* Generates attraction points out of real data from OSM.
...
...
src/de/tud/kom/p2psim/impl/topology/placement/PositionDistribution.java
View file @
c3ef5c28
...
...
@@ -25,7 +25,7 @@ import java.util.Map;
import
de.tud.kom.p2psim.api.topology.TopologyComponent
;
import
de.tud.kom.p2psim.api.topology.placement.PlacementModel
;
import
de.tud.kom.p2psim.impl.topology.PositionVector
;
import
de.tud.kom.p2psim.impl.topology.
util.
PositionVector
;
/**
* Unified interface for Position-Distributions based on PositionVectors. When
...
...
src/de/tud/kom/p2psim/impl/topology/placement/RSUPlacement.java
View file @
c3ef5c28
...
...
@@ -24,9 +24,9 @@ import java.util.List;
import
de.tud.kom.p2psim.api.topology.TopologyComponent
;
import
de.tud.kom.p2psim.api.topology.placement.PlacementModel
;
import
de.tud.kom.p2psim.impl.topology.PositionVector
;
import
de.tud.kom.p2psim.impl.topology.movement.vehicular.sumo.simulation.controller.traci.TraciSimulationController
;
import
de.tud.kom.p2psim.impl.topology.movement.vehicular.sumo.simulation.controller.xml.XMLSimulationController
;
import
de.tud.kom.p2psim.impl.topology.util.PositionVector
;
import
de.tudarmstadt.maki.simonstrator.api.component.sensor.location.Location
;
import
de.tudarmstadt.maki.simonstrator.api.component.vehicular.api.SimulationSetupExtractor
;
import
de.tudarmstadt.maki.simonstrator.api.util.XMLConfigurableConstructor
;
...
...
src/de/tud/kom/p2psim/impl/topology/placement/RandomPositionDistribution.java
View file @
c3ef5c28
...
...
@@ -22,7 +22,7 @@ package de.tud.kom.p2psim.impl.topology.placement;
import
java.util.Random
;
import
de.tud.kom.p2psim.impl.topology.PositionVector
;
import
de.tud.kom.p2psim.impl.topology.
util.
PositionVector
;
import
de.tudarmstadt.maki.simonstrator.api.Randoms
;
/**
...
...
src/de/tud/kom/p2psim/impl/topology/ExtendedPositionVector.java
→
src/de/tud/kom/p2psim/impl/topology/
util/
ExtendedPositionVector.java
View file @
c3ef5c28
...
...
@@ -21,7 +21,7 @@
/**
*
*/
package
de.tud.kom.p2psim.impl.topology
;
package
de.tud.kom.p2psim.impl.topology
.util
;
/**
* @author Christian Gross
...
...
src/de/tud/kom/p2psim/impl/topology/LocalGraphView.java
→
src/de/tud/kom/p2psim/impl/topology/
util/
LocalGraphView.java
View file @
c3ef5c28
...
...
@@ -18,7 +18,7 @@
*
*/
package
de.tud.kom.p2psim.impl.topology
;
package
de.tud.kom.p2psim.impl.topology
.util
;
import
java.util.List
;
import
java.util.Set
;
...
...
@@ -29,6 +29,7 @@ import de.tud.kom.p2psim.api.linklayer.mac.MacLayer;
import
de.tud.kom.p2psim.api.linklayer.mac.PhyType
;
import
de.tud.kom.p2psim.api.topology.Topology
;
import
de.tud.kom.p2psim.api.topology.views.TopologyView
;
import
de.tud.kom.p2psim.impl.topology.component.DefaultTopologyComponent
;
import
de.tudarmstadt.maki.simonstrator.api.Graphs
;
import
de.tudarmstadt.maki.simonstrator.api.Host
;
import
de.tudarmstadt.maki.simonstrator.api.Oracle
;
...
...
src/de/tud/kom/p2psim/impl/topology/LocationRequestImpl.java
→
src/de/tud/kom/p2psim/impl/topology/
util/
LocationRequestImpl.java
View file @
c3ef5c28
...
...
@@ -18,7 +18,7 @@
*
*/
package
de.tud.kom.p2psim.impl.topology
;
package
de.tud.kom.p2psim.impl.topology
.util
;
import
java.util.LinkedList
;
import
java.util.List
;
...
...
@@ -62,7 +62,7 @@ public class LocationRequestImpl implements LocationRequest, EventHandler {
this
.
locationSensor
=
locationSensor
;
}
p
rotected
void
cancel
(
LocationListener
listener
)
{
p
ublic
void
cancel
(
LocationListener
listener
)
{
boolean
removed
=
listeners
.
remove
(
listener
);
if
(
listeners
.
isEmpty
())
{
// upcoming event is no longer valid!
...
...
@@ -71,7 +71,7 @@ public class LocationRequestImpl implements LocationRequest, EventHandler {
assert
removed
;
}
p
rotected
void
immunizeAndStart
(
LocationListener
listener
)
{
p
ublic
void
immunizeAndStart
(
LocationListener
listener
)
{
immune
=
true
;
assert
interval
>
0
;
if
(
listeners
.
isEmpty
())
{
...
...
src/de/tud/kom/p2psim/impl/topology/PositionVector.java
→
src/de/tud/kom/p2psim/impl/topology/
util/
PositionVector.java
View file @
c3ef5c28
...
...
@@ -18,7 +18,7 @@
*
*/
package
de.tud.kom.p2psim.impl.topology
;
package
de.tud.kom.p2psim.impl.topology
.util
;
import
java.awt.Point
;
import
java.util.Arrays
;
...
...
src/de/tud/kom/p2psim/impl/topology/views/AbstractTopologyView.java
View file @
c3ef5c28
...
...
@@ -39,7 +39,7 @@ import de.tud.kom.p2psim.api.topology.movement.MovementSupported;
import
de.tud.kom.p2psim.api.topology.views.DropProbabilityDeterminator
;
import
de.tud.kom.p2psim.api.topology.views.LatencyDeterminator
;
import
de.tud.kom.p2psim.api.topology.views.TopologyView
;
import
de.tud.kom.p2psim.impl.topology.PositionVector
;
import
de.tud.kom.p2psim.impl.topology.
util.
PositionVector
;
import
de.tudarmstadt.maki.simonstrator.api.Binder
;
import
de.tudarmstadt.maki.simonstrator.api.Host
;
import
de.tudarmstadt.maki.simonstrator.api.Monitor
;
...
...
src/de/tud/kom/p2psim/impl/topology/views/FiveGTopologyView.java
View file @
c3ef5c28
...
...
@@ -33,7 +33,7 @@ import de.tud.kom.p2psim.api.linklayer.mac.MacLayer;
import
de.tud.kom.p2psim.api.linklayer.mac.PhyType
;
import
de.tud.kom.p2psim.api.topology.obstacles.ObstacleModel
;
import
de.tud.kom.p2psim.api.topology.waypoints.WaypointModel
;
import
de.tud.kom.p2psim.impl.topology.PositionVector
;
import
de.tud.kom.p2psim.impl.topology.
util.
PositionVector
;
import
de.tud.kom.p2psim.impl.topology.views.FiveGTopologyView.CellLink
;
import
de.tud.kom.p2psim.impl.topology.views.fiveg.FiveGTopologyDatabase
;
import
de.tud.kom.p2psim.impl.topology.views.fiveg.FiveGTopologyDatabase.Entry
;
...
...
src/de/tud/kom/p2psim/impl/topology/views/visualization/world/NodeInfoComponentVis.java
View file @
c3ef5c28
...
...
@@ -38,7 +38,7 @@ import javax.swing.event.ChangeEvent;
import
javax.swing.event.ChangeListener
;
import
de.tud.kom.p2psim.api.common.SimHost
;
import
de.tud.kom.p2psim.impl.topology.PositionVector
;
import
de.tud.kom.p2psim.impl.topology.
util.
PositionVector
;
import
de.tud.kom.p2psim.impl.topology.views.VisualizationTopologyView.VisNodeInformation
;
import
de.tud.kom.p2psim.impl.topology.views.VisualizationTopologyView.VisualizationInjector
;
import
de.tud.kom.p2psim.impl.topology.views.visualization.ui.VisualizationComponent
;
...
...
src/de/tud/kom/p2psim/impl/topology/views/visualization/world/SocialViewComponentVis.java
View file @
c3ef5c28
...
...
@@ -43,7 +43,7 @@ import javax.swing.event.ChangeListener;
import
de.tud.kom.p2psim.api.common.SimHost
;
import
de.tud.kom.p2psim.api.topology.social.SocialView
;
import
de.tud.kom.p2psim.impl.topology.PositionVector
;
import
de.tud.kom.p2psim.impl.topology.
util.
PositionVector
;
import
de.tud.kom.p2psim.impl.topology.views.VisualizationTopologyView.VisualizationInjector
;
import
de.tud.kom.p2psim.impl.topology.views.VisualizationTopologyView.VisualizationInjector.MouseClickListener
;
import
de.tud.kom.p2psim.impl.topology.views.visualization.ui.VisualizationComponent
;
...
...
Prev
1
2
3
4
5
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment