Skip to content

GitLab

Commit 51027aa4 authored by Tobias Meuser's avatar Tobias Meuser
Browse files

Added spatial metric

parent b3c75941
Hide whitespace changes
Inline Side-by-side
src/de/tud/kom/p2psim/impl/analyzer/metric/output/MetricOutputDAO.java
View file @ 51027aa4
......@@ -20,6 +20,7 @@
package de.tud.kom.p2psim.impl.analyzer.metric.output;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.LinkedList;
......@@ -54,113 +55,113 @@ import de.tudarmstadt.maki.simonstrator.api.util.XMLConfigurableConstructor;
*/
public class MetricOutputDAO extends AbstractOutput {
protected long timeEnableDao = 0;
protected long timeStopDao = Long.MAX_VALUE;
protected Set<String> metricsToAggregate = new LinkedHashSet<>();
protected List<DaoAdapter> daoAdapters = new LinkedList<>();
/**
*
* @param table
*/
@XMLConfigurableConstructor({ "table" })
public MetricOutputDAO(String table) {
DAO.database = table;
}
public void setUser(String user) {
DAO.username = user;
}
public void setPassword(String password) {
DAO.password = password;
}
public void setTimeEnableDao(long timeEnableDao) {
this.timeEnableDao = timeEnableDao;
}
public void setTimeStopDao(long timeStopDao) {
this.timeStopDao = timeStopDao;
}
/**
* A list of PER-HOST metrics that are NOT written individually but instead
* statistical figures for a group of hosts is written. The group of hosts
* is defined by the hostGroup from the XML-config.
*
* @param metricsToAggregate
*/
public void setToAggregate(String[] metricsToAggregate) {
for (String metric : metricsToAggregate) {
this.metricsToAggregate.add(metric);
}
}
public boolean isToAggregate(Metric metric) {
for (String string : metricsToAggregate) {
if (metric.getName().equals(string)) {
return true;
}
if (string.endsWith("*")) {
// prefix matching
String mName = metric.getName();
if (mName.startsWith(string.substring(0, string.length()-1))) {
return true;
}
}
if (string.startsWith("*")) {
// postfix matching
String mName = metric.getName();
if (mName.endsWith(string.substring(1, string.length()))) {
return true;
}
}
}
return false;
}
@Override
public void onInitialize(List<Metric> metrics) {
for (Metric metric : metrics) {
/*
* Only active metrics are allowed. We register as a listener and
* wait for our call.
*/
if (metric instanceof ActiveMetric) {
ActiveMetric am = (ActiveMetric) metric;
MetricDaoAdapter adapter = new MetricDaoAdapter(am);
am.addActiveMetricListener(adapter);
daoAdapters.add(adapter);
}
if (metric instanceof ActiveSpatialMetric) {
ActiveSpatialMetric asm = (ActiveSpatialMetric) metric;
SpatialMetricDaoAdapter adapter = new SpatialMetricDaoAdapter(asm);
protected long timeEnableDao = 0;
protected long timeStopDao = Long.MAX_VALUE;
protected Set<String> metricsToAggregate = new LinkedHashSet<>();
protected List<DaoAdapter> daoAdapters = new LinkedList<>();
/**
*
* @param table
*/
@XMLConfigurableConstructor({ "table" })
public MetricOutputDAO(String table) {
DAO.database = table;
}
public void setUser(String user) {
DAO.username = user;
}
public void setPassword(String password) {
DAO.password = password;
}
public void setTimeEnableDao(long timeEnableDao) {
this.timeEnableDao = timeEnableDao;
}
public void setTimeStopDao(long timeStopDao) {
this.timeStopDao = timeStopDao;
}
/**
* A list of PER-HOST metrics that are NOT written individually but instead
* statistical figures for a group of hosts is written. The group of hosts is
* defined by the hostGroup from the XML-config.
*
* @param metricsToAggregate
*/
public void setToAggregate(String[] metricsToAggregate) {
for (String metric : metricsToAggregate) {
this.metricsToAggregate.add(metric);
}
}
public boolean isToAggregate(Metric metric) {
for (String string : metricsToAggregate) {
if (metric.getName().equals(string)) {
return true;
}
if (string.endsWith("*")) {
// prefix matching
String mName = metric.getName();
if (mName.startsWith(string.substring(0, string.length() - 1))) {
return true;
}
}
if (string.startsWith("*")) {
// postfix matching
String mName = metric.getName();
if (mName.endsWith(string.substring(1, string.length()))) {
return true;
}
}
}
return false;
}
@Override
public void onInitialize(List<Metric> metrics) {
for (Metric metric : metrics) {
/*
* Only active metrics are allowed. We register as a listener and wait for our
* call.
*/
if (metric instanceof ActiveMetric) {
ActiveMetric am = (ActiveMetric) metric;
MetricDaoAdapter adapter = new MetricDaoAdapter(am);
am.addActiveMetricListener(adapter);
daoAdapters.add(adapter);
}
if (metric instanceof ActiveSpatialMetric) {
ActiveSpatialMetric asm = (ActiveSpatialMetric) metric;
SpatialMetricDaoAdapter adapter = new SpatialMetricDaoAdapter(asm);
asm.addActiveSpatialMetricListener(adapter);
daoAdapters.add(adapter);
}
}
}
@Override
public void onStop() {
for (DaoAdapter adapter : daoAdapters) {
adapter.onStop();
}
/*
* Commit missing values
*/
DAO.commitQueue();
}
private interface DaoAdapter {
void onStop();
}
/**
}
}
}
@Override
public void onStop() {
for (DaoAdapter adapter : daoAdapters) {
adapter.onStop();
}
/*
* Commit missing values
*/
DAO.commitQueue();
}
private interface DaoAdapter {
void onStop();
}
/**
* This class helps in persisting a metric using the {@link MeasurementDAO}
*
* @author Bjoern Richerzhagen
......@@ -186,8 +187,7 @@ public class MetricOutputDAO extends AbstractOutput {
public MetricDaoAdapter(ActiveMetric metric) {
this.metric = metric;
this.md = new MetricDescription(MetricOutputDAO.class.getName(),
metric.getName(), metric.getDescription(),
this.md = new MetricDescription(MetricOutputDAO.class.getName(), metric.getName(), metric.getDescription(),
metric.getUnit().toString());
this.hosts = GlobalOracle.getHosts();
this.writeAggregates = isToAggregate(metric);
......@@ -197,8 +197,7 @@ public class MetricOutputDAO extends AbstractOutput {
String groupId = simHost.getProperties().getGroupID();
if (!this.hostsByGroup.containsKey(groupId)) {
this.hostsByGroup.put(groupId, new LinkedList<>());
this.globalStatsByGroup.put(groupId,
new DescriptiveStatistics());
this.globalStatsByGroup.put(groupId, new DescriptiveStatistics());
}
this.hostsByGroup.get(groupId).add(simHost);
}
......@@ -206,12 +205,9 @@ public class MetricOutputDAO extends AbstractOutput {
public void onStop() {
if (writeAggregates) {
for (Entry<String, DescriptiveStatistics> groupData : globalStatsByGroup
.entrySet()) {
MeasurementDAO.storeGroupStatisticsMeasurement(md,
groupData.getKey(), Time.getCurrentTime(),
groupData.getValue(),
Time.getCurrentTime() - timeEnableDao, true);
for (Entry<String, DescriptiveStatistics> groupData : globalStatsByGroup.entrySet()) {
MeasurementDAO.storeGroupStatisticsMeasurement(md, groupData.getKey(), Time.getCurrentTime(),
groupData.getValue(), Time.getCurrentTime() - timeEnableDao, true);
}
globalStatsByGroup.clear();
}
......@@ -239,24 +235,20 @@ public class MetricOutputDAO extends AbstractOutput {
// per-host metric
if (writeAggregates) {
/*
* Write aggregates instead of individual metric values.
* This can be improved w.r.t. performance, but currently we
* do not really care.
* Write aggregates instead of individual metric values. This can be improved
* w.r.t. performance, but currently we do not really care.
*/
// Iterate over groups
for (String group : hostsByGroup.keySet()) {
DescriptiveStatistics stats = new DescriptiveStatistics();
DescriptiveStatistics globalStats = globalStatsByGroup
.get(group);
DescriptiveStatistics globalStats = globalStatsByGroup.get(group);
for (SimHost host : hostsByGroup.get(group)) {
MetricValue mv = metric
.getPerHostMetric(host.getId());
MetricValue mv = metric.getPerHostMetric(host.getId());
if (mv != null) {
Object val = mv.getValue();
if (mv.isValid()) {
if (val instanceof Number) {
double vd = ((Number) val)
.doubleValue();
double vd = ((Number) val).doubleValue();
if (Double.isNaN(vd)) {
continue;
}
......@@ -268,14 +260,12 @@ public class MetricOutputDAO extends AbstractOutput {
}
}
// Write Group stats
long observationDuration = Time.getCurrentTime()
- timestampLastEvent;
long observationDuration = Time.getCurrentTime() - timestampLastEvent;
if (timestampLastEvent == -1) {
observationDuration = Time.getCurrentTime()
- timeEnableDao;
observationDuration = Time.getCurrentTime() - timeEnableDao;
}
MeasurementDAO.storeGroupStatisticsMeasurement(md,
group, time, stats, observationDuration, false);
MeasurementDAO.storeGroupStatisticsMeasurement(md, group, time, stats, observationDuration,
false);
}
timestampLastEvent = Time.getCurrentTime();
} else {
......@@ -289,8 +279,7 @@ public class MetricOutputDAO extends AbstractOutput {
if (Double.isNaN(vd)) {
continue;
}
dao.storeSingleMeasurement(md,
host.getHostId(), time, vd);
dao.storeSingleMeasurement(md, host.getHostId(), time, vd);
}
}
}
......@@ -302,7 +291,8 @@ public class MetricOutputDAO extends AbstractOutput {
}
/**
* This class helps in persisting a spatial metric using the {@link MeasurementDAO}
* This class helps in persisting a spatial metric using the
* {@link MeasurementDAO}
*
* @author Tobias Meuser
* @version 1.0, 10.10.2018
......@@ -319,11 +309,16 @@ public class MetricOutputDAO extends AbstractOutput {
private final Map<String, DescriptiveStatistics> globalStatsByGroup;
private double spatialResolution = 20;
private Map<GridKey, Double> values = new HashMap<>();
private long lastUpdate = -1;
private final double spatialResolution;
private ActiveSpatialMetric<?> metric;
public SpatialMetricDaoAdapter(ActiveSpatialMetric metric) {
this.md = new MetricDescription(MetricOutputDAO.class.getName(),
metric.getName(), metric.getDescription(),
this.metric = metric;
this.md = new MetricDescription(MetricOutputDAO.class.getName(), metric.getName(), metric.getDescription(),
metric.getUnit().toString());
this.hosts = GlobalOracle.getHosts();
this.hostsByGroup = new LinkedHashMap<>();
......@@ -332,16 +327,26 @@ public class MetricOutputDAO extends AbstractOutput {
String groupId = simHost.getProperties().getGroupID();
if (!this.hostsByGroup.containsKey(groupId)) {
this.hostsByGroup.put(groupId, new LinkedList<>());
this.globalStatsByGroup.put(groupId,
new DescriptiveStatistics());
this.globalStatsByGroup.put(groupId, new DescriptiveStatistics());
}
this.hostsByGroup.get(groupId).add(simHost);
}
spatialResolution = metric.getResolution();
}
@Override
public void onStop() {
// Noting to do here
store();
}
private void store() {
for (Entry<GridKey, Double> entry : values.entrySet()) {
dao.storeGlobalSpatialMeasurement(md, lastUpdate, entry.getValue(), entry.getKey().getX(),
entry.getKey().getY());
}
values.clear();
lastUpdate = Time.getCurrentTime();
}
@Override
......@@ -352,7 +357,12 @@ public class MetricOutputDAO extends AbstractOutput {
return;
}
if (metric.isOverallMetric()) {
if (!metric.isAggregated() || Time.getCurrentTime() != lastUpdate) {
store();
}
// global
SpatialMetricValue mv = metric.getOverallMetric();
Object val = mv.getValue();
......@@ -360,9 +370,16 @@ public class MetricOutputDAO extends AbstractOutput {
if (val instanceof Number) {
double vd = ((Number) val).doubleValue();
dao.storeGlobalSpatialMeasurement(md, time, vd,
(int) (mv.getLocation().getLongitude() / spatialResolution),
GridKey key = new GridKey((int) (mv.getLocation().getLongitude() / spatialResolution),
(int) (mv.getLocation().getLatitude() / spatialResolution));
if (!values.containsKey(key)) {
values.put(key, vd);
} else {
double storedValue = values.get(key);
if (storedValue < vd) {
values.put(key, vd);
}
}
}
}
} else {
......@@ -385,7 +402,37 @@ public class MetricOutputDAO extends AbstractOutput {
}
}
}
}
private class GridKey {
private final int x;
private final int y;
public GridKey(int pX, int pY) {
x = pX;
y = pY;
}
public int getX() {
return x;
}
public int getY() {
return y;
}
@Override
public int hashCode() {
return Integer.hashCode(x) << 16 + Integer.hashCode(y);
}
@Override
public boolean equals(Object pObj) {
if (pObj instanceof GridKey) {
return x == ((GridKey) pObj).x && y == ((GridKey) pObj).y;
}
return false;
}
}
}
src/de/tud/kom/p2psim/impl/analyzer/metric/spatial/AbstractSpatialMetric.java
View file @ 51027aa4
......@@ -29,6 +29,8 @@ import de.tudarmstadt.maki.simonstrator.api.common.metric.Metric;
public abstract class AbstractSpatialMetric<T extends AbstractSpatialMetricValue<?>> extends AbstractMetric<T> implements Metric<T>, ActiveSpatialMetric<T> {
protected boolean aggregate = false;
public AbstractSpatialMetric(String pDescription, MetricUnit pUnit) {
super(pDescription, pUnit);
}
......@@ -42,6 +44,11 @@ public abstract class AbstractSpatialMetric<T extends AbstractSpatialMetricValue
super.setOverallMetric(aggregate);
}
@Override
public boolean isAggregated() {
return aggregate;
}
private List<ActiveSpatialMetricListener> _listeners = new ArrayList<>();
@Override
......
src/de/tud/kom/p2psim/impl/topology/movement/VehicleMovementModel.java
View file @ 51027aa4
......@@ -75,9 +75,6 @@ public class VehicleMovementModel implements MovementModel, EventHandler {
private final int width;
private final int height;
private double scenarioWidth = 0;
private double scenarioHeight = 0;
private final String sumoExe;
private final String sumoConfigFile;
private final String sumoTrace;
......@@ -269,9 +266,6 @@ public class VehicleMovementModel implements MovementModel, EventHandler {
_extractor = simulationController;
}
scenarioWidth = _extractor.getScenarioWidth();
scenarioHeight = _extractor.getScenarioHeight();
System.out.println("Initialization: done.");
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment