From 16293946129557cb853e9de2bc440f8c0684cd74 Mon Sep 17 00:00:00 2001
From: brutzman <brutzman@nps.edu>
Date: Sun, 15 Aug 2021 11:43:57 -0700
Subject: [PATCH] reduced output message if list is empty
---
.../stream/X3dCreateInterpolators.java | 8 +-
.../utilities/stream/X3dCreateLineSet.java | 8 +-
.../stream/X3dSlidingWindowCompression.java | 305 +++++++++---------
3 files changed, 167 insertions(+), 154 deletions(-)
diff --git a/src/edu/nps/moves/dis7/utilities/stream/X3dCreateInterpolators.java b/src/edu/nps/moves/dis7/utilities/stream/X3dCreateInterpolators.java
index 71ef45cab6..b8d189f2ee 100644
--- a/src/edu/nps/moves/dis7/utilities/stream/X3dCreateInterpolators.java
+++ b/src/edu/nps/moves/dis7/utilities/stream/X3dCreateInterpolators.java
@@ -122,8 +122,14 @@ public class X3dCreateInterpolators {
//returnMap.putAll(testMap);
//Writing all values from the KeyMap to a proper Position Interpolator String
- System.out.println("Writing Position and Rotation Interpolator");
Set<Double> keys = returnMap.keySet();
+ if (keys.isEmpty())
+ {
+ System.out.println("Insufficient keys to create X3D interpolators");
+ return;
+ }
+ else System.out.println("Writing X3D PositionInterpolator and OrientationInterpolator");
+
//Set<Double> keys = tempKeyKeyValueSetPositionInterPolator.keySet();
String positionKey = "key = '";
String positionKeyValue = "keyValue = '";
diff --git a/src/edu/nps/moves/dis7/utilities/stream/X3dCreateLineSet.java b/src/edu/nps/moves/dis7/utilities/stream/X3dCreateLineSet.java
index 10bfaa7694..c3593409db 100644
--- a/src/edu/nps/moves/dis7/utilities/stream/X3dCreateLineSet.java
+++ b/src/edu/nps/moves/dis7/utilities/stream/X3dCreateLineSet.java
@@ -118,8 +118,14 @@ public class X3dCreateLineSet {
//returnMap.putAll(testMap);
//Writing all values from the KeyMap to a proper Position Interpolator String
- System.out.println("Writing X3D LineSet");
Set<Double> keys = returnMap.keySet();
+ if (keys.isEmpty())
+ {
+ System.out.println("Insufficient keys to create X3D LineSet");
+ return;
+ }
+ else System.out.println("Writing X3D LineSet");
+
String lineSetPoints = "";
String lineSet = "<LineSet vertexCount='" + returnMap.size() + "'> \n <Coordinate point='";
diff --git a/src/edu/nps/moves/dis7/utilities/stream/X3dSlidingWindowCompression.java b/src/edu/nps/moves/dis7/utilities/stream/X3dSlidingWindowCompression.java
index fb3b9978fa..0191e00f04 100644
--- a/src/edu/nps/moves/dis7/utilities/stream/X3dSlidingWindowCompression.java
+++ b/src/edu/nps/moves/dis7/utilities/stream/X3dSlidingWindowCompression.java
@@ -1,152 +1,153 @@
-package edu.nps.moves.dis7.utilities.stream;
-
-import static java.lang.Math.pow;
-import static java.lang.Math.sqrt;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableMap;
-import java.util.Set;
-import java.util.TreeMap;
-
-/**
- *
- * @author Tobias Brennenstuhl @ NPS
- */
-public class X3dSlidingWindowCompression {
-
- private Map<Double, X3dCoordinates> localMap;
-
- /**
- * Constructor
- * @param localHashMap double map of X3dCoordinates
- */
- public X3dSlidingWindowCompression(Map<Double, X3dCoordinates> localHashMap) {
-
- this.localMap = new LinkedHashMap<>();
- Set<Double> keys = localHashMap.keySet();
- for (Double k : keys) {
- localMap.put(k, localHashMap.get(k));
- }
- }
-
- /**
- * Perform sliding window computations
- * @return double map of X3dCoordinates
- */
- public Map<Double, X3dCoordinates> doSlidingWindow() {
-
- System.out.println("DISTools.Regression.doRegression()");
- //Check whether points could be deleted to compress the stream
- //https://www.crashkurs-statistik.de/einfache-lineare-regression/
- Map<Double, X3dCoordinates> streamMap = new TreeMap<>(localMap);
- //Copy LinkedHashMap into TreeMap to be able to pull the first element.
- Map<Double, X3dCoordinates> returnMap = new TreeMap<>();
- //TreeMap of slidingWindows will store all of the points that are currently processed
- //use .pullFirstEntry() to get rid of the points at the beginning.
- Map<Double, X3dCoordinates> slidingWindow = new TreeMap<>();
-
- Set<Double> slidingWindowKeys;
- /** List of Times in Seconds */
- List<Double> timestampList = new ArrayList<>();
- /** List of x coordinates in meters*/
- List<Double> xList = new ArrayList<>();
- /** List of y coordinates in meters*/
- List<Double> yList = new ArrayList<>();
- /** List of z coordinates in meters*/
- List<Double> zList = new ArrayList<>();
- /** List of angle phi in radians*/
- List<Double> phiList = new ArrayList<>();
- /** List of angle psi in radians*/
- List<Double> psiList = new ArrayList<>();
- /** List of angle theta in radians*/
- List<Double> thetaList = new ArrayList<>();
- double key;
- Double[] k;
- double a, b, c, s, areaA;
- X3dCoordinates leftPoints;
-
- while (streamMap.size() > 0) {
- key = (double) ((NavigableMap)streamMap).firstEntry().getKey();
- slidingWindow.put(key, streamMap.get(key));
- ((NavigableMap)streamMap).pollFirstEntry();
-
- //Calculate the mean and SD
- slidingWindowKeys = slidingWindow.keySet();
-
- if (slidingWindow.size() >= 3) {
-
- k = new Double[slidingWindowKeys.size()];
- slidingWindowKeys.toArray(k);
-
- for (int i = 0; i < slidingWindow.size(); i++) {
-
- timestampList.add(i, k[i]);
-
- phiList.add(i, slidingWindow.get(k[i]).getPhi());
- psiList.add(i, slidingWindow.get(k[i]).getPsi());
- thetaList.add(i, slidingWindow.get(k[i]).getTheta());
- xList.add(i, slidingWindow.get(k[i]).getX());
- yList.add(i, slidingWindow.get(k[i]).getY());
- zList.add(i, slidingWindow.get(k[i]).getZ());
- }
-
- //Calculate Area of Triangle
- //Credit: http://www.ambrsoft.com/TrigoCalc/Line3D/LineColinear.htm;
- X3dCoordinates firstPoint, lastPoint;
- for (int i = 0; i < slidingWindow.size(); i++) {
-
- a = sqrt(pow(xList.get(1) - xList.get(0), 2) + pow(yList.get(1) - yList.get(0), 2) + pow(zList.get(1) - zList.get(0), 2));
- b = sqrt(pow(xList.get(i) - xList.get(0), 2) + pow(yList.get(i) - yList.get(0), 2) + pow(zList.get(i) - zList.get(0), 2));
- c = sqrt(pow(xList.get(i) - xList.get(1), 2) + pow(yList.get(i) - yList.get(1), 2) + pow(zList.get(i) - zList.get(1), 2));
- s = (a + b + c) / 2;
- areaA = sqrt(s * (s - a) * (s - b) * (s - c));
-
- //Threshold can be adjusted (areaA)
- if ((areaA >= 0.1) || (timestampList.get(i) - timestampList.get(0) >= 4.0)) {
- //grab the first and the last point from the sliding window and push it to the returnMap
- firstPoint = new X3dCoordinates();
- firstPoint.setX(xList.get(0));
- firstPoint.setY(yList.get(0));
- firstPoint.setZ(zList.get(0));
- firstPoint.setPhi(phiList.get(0));
- firstPoint.setPsi(psiList.get(0));
- firstPoint.setTheta(thetaList.get(0));
-
- lastPoint = new X3dCoordinates(xList.get(i), yList.get(i), zList.get(i), phiList.get(i), psiList.get(i), thetaList.get(i));
-
- returnMap.put(timestampList.get(0), firstPoint);
- returnMap.put(timestampList.get(i), lastPoint);
-
- slidingWindow.clear();
-
- timestampList.clear();
- xList.clear();
- yList.clear();
- zList.clear();
- phiList.clear();
- psiList.clear();
- thetaList.clear();
-
- break;
- }
-
- else if ((areaA < 0.1) && (timestampList.get(i) - timestampList.get(0) < 4.0) && streamMap.isEmpty()) {
-
- //System.out.println("StreamMap empty. All points left will be added. Break");
- //grab the first and the last point from the siding window and push it to the returnMap
- for (int j = 0; j < slidingWindow.size(); j++) {
- leftPoints = new X3dCoordinates(xList.get(j), yList.get(j), zList.get(j), phiList.get(j), psiList.get(j), thetaList.get(j));
- returnMap.put(timestampList.get(j), leftPoints);
- }
-
- break;
- }
- //System.out.println("Area of Triangle: " + areaA); //Debug
- }
- }
- }
- return returnMap;
- }
-}
+package edu.nps.moves.dis7.utilities.stream;
+
+import static java.lang.Math.pow;
+import static java.lang.Math.sqrt;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Set;
+import java.util.TreeMap;
+
+/**
+ *
+ * @author Tobias Brennenstuhl @ NPS
+ */
+public class X3dSlidingWindowCompression {
+
+ private Map<Double, X3dCoordinates> localMap;
+
+ /**
+ * Constructor
+ * @param localHashMap double map of X3dCoordinates
+ */
+ public X3dSlidingWindowCompression(Map<Double, X3dCoordinates> localHashMap) {
+
+ this.localMap = new LinkedHashMap<>();
+ Set<Double> keys = localHashMap.keySet();
+ for (Double k : keys) {
+ localMap.put(k, localHashMap.get(k));
+ }
+ }
+
+ /**
+ * Perform sliding window computations
+ * @return double map of X3dCoordinates
+ */
+ public Map<Double, X3dCoordinates> doSlidingWindow()
+ {
+ System.out.println("edu.nps.moves.dis7.utilities.stream.X3dSlidingWindowCompression.doSlidingWindow() regression: " +
+ "localMap.size()=" + localMap.size());
+ //Check whether points could be deleted to compress the stream
+ //https://www.crashkurs-statistik.de/einfache-lineare-regression/
+ Map<Double, X3dCoordinates> streamMap = new TreeMap<>(localMap);
+ //Copy LinkedHashMap into TreeMap to be able to pull the first element.
+ Map<Double, X3dCoordinates> returnMap = new TreeMap<>();
+ //TreeMap of slidingWindows will store all of the points that are currently processed
+ //use .pullFirstEntry() to get rid of the points at the beginning.
+ Map<Double, X3dCoordinates> slidingWindow = new TreeMap<>();
+
+ Set<Double> slidingWindowKeys;
+ /** List of Times in Seconds */
+ List<Double> timestampList = new ArrayList<>();
+ /** List of x coordinates in meters*/
+ List<Double> xList = new ArrayList<>();
+ /** List of y coordinates in meters*/
+ List<Double> yList = new ArrayList<>();
+ /** List of z coordinates in meters*/
+ List<Double> zList = new ArrayList<>();
+ /** List of angle phi in radians*/
+ List<Double> phiList = new ArrayList<>();
+ /** List of angle psi in radians*/
+ List<Double> psiList = new ArrayList<>();
+ /** List of angle theta in radians*/
+ List<Double> thetaList = new ArrayList<>();
+ double key;
+ Double[] k;
+ double a, b, c, s, areaA;
+ X3dCoordinates leftPoints;
+
+ while (streamMap.size() > 0) {
+ key = (double) ((NavigableMap)streamMap).firstEntry().getKey();
+ slidingWindow.put(key, streamMap.get(key));
+ ((NavigableMap)streamMap).pollFirstEntry();
+
+ //Calculate the mean and SD
+ slidingWindowKeys = slidingWindow.keySet();
+
+ if (slidingWindow.size() >= 3) {
+
+ k = new Double[slidingWindowKeys.size()];
+ slidingWindowKeys.toArray(k);
+
+ for (int i = 0; i < slidingWindow.size(); i++) {
+
+ timestampList.add(i, k[i]);
+
+ phiList.add(i, slidingWindow.get(k[i]).getPhi());
+ psiList.add(i, slidingWindow.get(k[i]).getPsi());
+ thetaList.add(i, slidingWindow.get(k[i]).getTheta());
+ xList.add(i, slidingWindow.get(k[i]).getX());
+ yList.add(i, slidingWindow.get(k[i]).getY());
+ zList.add(i, slidingWindow.get(k[i]).getZ());
+ }
+
+ //Calculate Area of Triangle
+ //Credit: http://www.ambrsoft.com/TrigoCalc/Line3D/LineColinear.htm;
+ X3dCoordinates firstPoint, lastPoint;
+ for (int i = 0; i < slidingWindow.size(); i++) {
+
+ a = sqrt(pow(xList.get(1) - xList.get(0), 2) + pow(yList.get(1) - yList.get(0), 2) + pow(zList.get(1) - zList.get(0), 2));
+ b = sqrt(pow(xList.get(i) - xList.get(0), 2) + pow(yList.get(i) - yList.get(0), 2) + pow(zList.get(i) - zList.get(0), 2));
+ c = sqrt(pow(xList.get(i) - xList.get(1), 2) + pow(yList.get(i) - yList.get(1), 2) + pow(zList.get(i) - zList.get(1), 2));
+ s = (a + b + c) / 2;
+ areaA = sqrt(s * (s - a) * (s - b) * (s - c));
+
+ //Threshold can be adjusted (areaA)
+ if ((areaA >= 0.1) || (timestampList.get(i) - timestampList.get(0) >= 4.0)) {
+ //grab the first and the last point from the sliding window and push it to the returnMap
+ firstPoint = new X3dCoordinates();
+ firstPoint.setX(xList.get(0));
+ firstPoint.setY(yList.get(0));
+ firstPoint.setZ(zList.get(0));
+ firstPoint.setPhi(phiList.get(0));
+ firstPoint.setPsi(psiList.get(0));
+ firstPoint.setTheta(thetaList.get(0));
+
+ lastPoint = new X3dCoordinates(xList.get(i), yList.get(i), zList.get(i), phiList.get(i), psiList.get(i), thetaList.get(i));
+
+ returnMap.put(timestampList.get(0), firstPoint);
+ returnMap.put(timestampList.get(i), lastPoint);
+
+ slidingWindow.clear();
+
+ timestampList.clear();
+ xList.clear();
+ yList.clear();
+ zList.clear();
+ phiList.clear();
+ psiList.clear();
+ thetaList.clear();
+
+ break;
+ }
+
+ else if ((areaA < 0.1) && (timestampList.get(i) - timestampList.get(0) < 4.0) && streamMap.isEmpty()) {
+
+ //System.out.println("StreamMap empty. All points left will be added. Break");
+ //grab the first and the last point from the siding window and push it to the returnMap
+ for (int j = 0; j < slidingWindow.size(); j++) {
+ leftPoints = new X3dCoordinates(xList.get(j), yList.get(j), zList.get(j), phiList.get(j), psiList.get(j), thetaList.get(j));
+ returnMap.put(timestampList.get(j), leftPoints);
+ }
+
+ break;
+ }
+ //System.out.println("Area of Triangle: " + areaA); //Debug
+ }
+ }
+ }
+ return returnMap;
+ }
+}
--
GitLab