Merge branch 'master' into 'cherry-pick-7698d9d7'

# Conflicts: # src/de/tud/kom/p2psim/impl/analyzer/metric/output/MetricOutputDAO.java # src/de/tud/kom/p2psim/impl/util/db/dao/DAO.java

Merge branch 'master' into 'cherry-pick-7698d9d7'
# Conflicts: # src/de/tud/kom/p2psim/impl/analyzer/metric/output/MetricOutputDAO.java # src/de/tud/kom/p2psim/impl/util/db/dao/DAO.java
eff5d429 · Julian Zobel · 1c7f20ec · 37020b44 · eff5d429 · eff5d429
Commit eff5d429 authored Apr 29, 2022 by Julian Zobel 🦄
--- a/src/de/tud/kom/p2psim/impl/topology/placement/CenterPlacement.java
+++ b/src/de/tud/kom/p2psim/impl/topology/placement/CenterPlacement.java
--- a/src/de/tud/kom/p2psim/impl/topology/placement/ConfigurableGridPositionDistribution.java
+++ b/src/de/tud/kom/p2psim/impl/topology/placement/ConfigurableGridPositionDistribution.java
--- a/src/de/tud/kom/p2psim/impl/topology/placement/CsvPlacement.java
+++ b/src/de/tud/kom/p2psim/impl/topology/placement/CsvPlacement.java
--- a/src/de/tud/kom/p2psim/impl/topology/placement/GNPPlacement.java
+++ b/src/de/tud/kom/p2psim/impl/topology/placement/GNPPlacement.java
--- a/src/de/tud/kom/p2psim/impl/topology/placement/GridPositionDistribution.java
+++ b/src/de/tud/kom/p2psim/impl/topology/placement/GridPositionDistribution.java
--- a/src/de/tud/kom/p2psim/impl/topology/placement/JSONPlacement.java
+++ b/src/de/tud/kom/p2psim/impl/topology/placement/JSONPlacement.java
--- a/src/de/tud/kom/p2psim/impl/topology/placement/PositionDistribution.java
+++ b/src/de/tud/kom/p2psim/impl/topology/placement/PositionDistribution.java
--- a/src/de/tud/kom/p2psim/impl/topology/placement/RSUPlacement.java
+++ b/src/de/tud/kom/p2psim/impl/topology/placement/RSUPlacement.java
--- a/src/de/tud/kom/p2psim/impl/topology/placement/RandomPositionDistribution.java
+++ b/src/de/tud/kom/p2psim/impl/topology/placement/RandomPositionDistribution.java
--- a/src/de/tud/kom/p2psim/impl/topology/placement/UAVBasePlacement.java
+++ b/src/de/tud/kom/p2psim/impl/topology/placement/UAVBasePlacement.java
--- a/src/de/tud/kom/p2psim/impl/topology/ExtendedPositionVector.java
+++ b/src/de/tud/kom/p2psim/impl/topology/ExtendedPositionVector.java
--- a/src/de/tud/kom/p2psim/impl/topology/util/LocalGraphView.java
+++ b/src/de/tud/kom/p2psim/impl/topology/util/LocalGraphView.java
--- a/src/de/tud/kom/p2psim/impl/topology/util/LocationRequestImpl.java
+++ b/src/de/tud/kom/p2psim/impl/topology/util/LocationRequestImpl.java
--- a/src/de/tud/kom/p2psim/impl/topology/PositionVector.java
+++ b/src/de/tud/kom/p2psim/impl/topology/PositionVector.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/FiveGTopologyView.java
+++ b/src/de/tud/kom/p2psim/impl/topology/views/FiveGTopologyView.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/visualization/ui/DisasterMetricChartAdapter.java
+++ b/src/de/tud/kom/p2psim/impl/topology/views/visualization/ui/DisasterMetricChartAdapter.java
--- a/src/de/tud/kom/p2psim/impl/topology/views/visualization/ui/MetricChartAdapter.java
+++ b/src/de/tud/kom/p2psim/impl/topology/views/visualization/ui/MetricChartAdapter.java