Adjustments, tests and optimizations

Assets/Plotting/.idea/workspace.xml

@@ -2,99 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="ee646045-196c-400d-a2b8-69533432d097" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/../Models/Streets/incrementalSave.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../Models/Streets/incrementalSave/SM_Env_Road_01.fbx.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../Models/Streets/incrementalSave/SM_Env_Road_01.fbx/SM_Env_Road_01.0001.fbx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../Models/Streets/incrementalSave/SM_Env_Road_01.fbx/SM_Env_Road_01.0001.fbx.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../Scripts/Debugging.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../Scripts/Debugging/ObjectAndMaterialCounter.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../Scripts/Debugging/ObjectAndMaterialCounter.cs.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../Scripts/Study.meta" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../../out/material_hierarchy.txt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../../out/material_list.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../Assembly-CSharp.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/../../Assembly-CSharp.csproj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Materials/3dArrowMaterial.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../Materials/3dArrowMaterial.mat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Materials/BokehMaterial.mat" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Materials/BokehMaterial.mat.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Materials/PavementColor.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../Materials/PavementColor.mat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Materials/ViveTrackerMaterial.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../Materials/ViveTrackerMaterial.mat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Materials/_kybox_Mat.mat" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Materials/_kybox_Mat.mat.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_01.fbx" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_01.fbx.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_02.fbx" beforeDir="false" afterPath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_02.fbx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_03.fbx" beforeDir="false" afterPath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_03.fbx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_Arrow_01.fbx" beforeDir="false" afterPath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_Arrow_01.fbx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_Arrow_02.fbx" beforeDir="false" afterPath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_Arrow_02.fbx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_Bare_01.fbx" beforeDir="false" afterPath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_Bare_01.fbx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_Crossing_01.fbx" beforeDir="false" afterPath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_Crossing_01.fbx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_Curve_01.fbx" beforeDir="false" afterPath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_Curve_01.fbx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_Curve_02.fbx" beforeDir="false" afterPath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_Curve_02.fbx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_Lines_01.fbx" beforeDir="false" afterPath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_Lines_01.fbx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_Lines_02.fbx" beforeDir="false" afterPath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_Lines_02.fbx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_ParkingLines_01.fbx" beforeDir="false" afterPath="$PROJECT_DIR$/../Models/Streets/SM_Env_Road_ParkingLines_01.fbx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/Billboard_Mat.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Materials/Billboard_Mat.mat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Glass_Mat.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Glass_Mat.mat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Glass_Veh_Mat.mat" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Glass_Veh_Mat.mat.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_01_A.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_01_A.mat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_01_C.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_01_C.mat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_02_A.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_02_A.mat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_02_C.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_02_C.mat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_03_A.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_03_A.mat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_03_B.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_03_B.mat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_03_C.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_03_C.mat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_04_A.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_04_A.mat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_04_B.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_04_B.mat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_04_C.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_04_C.mat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_Road_01.mat" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_Road_01.mat" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_Road_02.mat" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_Road_02.mat.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_Road_03.mat" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_Road_03.mat.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_Road_04.mat" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Materials/PolygonCity_Mat_Road_04.mat.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/Emissive_01.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/Emissive_01.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/Emissive_02.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/Emissive_02.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/Emissive_03.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/Emissive_03.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/Emissive_04.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/Emissive_04.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/Emissive_05.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/Emissive_05.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Road_01.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Road_01.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Road_01.tx" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Road_01.tx.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Road_Normal.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Road_Normal.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Road_Normal.tx" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Road_Normal.tx.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_01_A.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_01_A.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_01_A.tx" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_01_A.tx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_01_B.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_01_B.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_01_C.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_01_C.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_02_A.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_02_A.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_02_B.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_02_B.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_02_C.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_02_C.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_03_A.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_03_A.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_03_B.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_03_B.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_03_C.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_03_C.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_04_A.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_04_A.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_04_B.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_04_B.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_04_C.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_04_C.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_Metallic.tga.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_Metallic.tga.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_Normal.png.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../PolygonCity/Textures/PolygonCity_Texture_Normal.png.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Prefabs/SM_Env_Road_01.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/../Prefabs/SM_Env_Road_01.prefab" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../Scenes/MainScene.unity" beforeDir="false" afterPath="$PROJECT_DIR$/../Scenes/MainScene.unity" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Scripts/ConditionManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Scripts/Study/ConditionManager.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Scripts/ConditionManager.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../Scripts/Study/ConditionManager.cs.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Scripts/DuplicateManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Scripts/Debugging/DuplicateManager.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Scripts/DuplicateManager.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../Scripts/Debugging/DuplicateManager.cs.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Scripts/Logging/Base/Logging.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Scripts/Logging/Base/Logging.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Scripts/SimpleCameraController.cs" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Scripts/SimpleCameraController.cs.meta" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Scripts/SubjectManager.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Scripts/Study/SubjectManager.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Scripts/SubjectManager.cs.meta" beforeDir="false" afterPath="$PROJECT_DIR$/../Scripts/Study/SubjectManager.cs.meta" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../Settings/UniversalRP-HighQuality.asset" beforeDir="false" afterPath="$PROJECT_DIR$/../Settings/UniversalRP-HighQuality.asset" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../ProjectSettings/FbxExportSettings.asset" beforeDir="false" afterPath="$PROJECT_DIR$/../../ProjectSettings/FbxExportSettings.asset" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../Scripts/IgnoreClipping.cs" beforeDir="false" afterPath="$PROJECT_DIR$/../Scripts/IgnoreClipping.cs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

Assets/Plotting/main.py

@@ -12,7 +12,7 @@ from functools import reduce
 from data import Data
 from tools import get_options, generate_figure
 
-logs_path = "../Logs/Subject_0"
+logs_path = "../Logs/Subject_1909"
 log_files = sorted([file for file in os.listdir(logs_path) if not '.' in file], reverse=True)
 d1 = Data(logs_path)
 d2 = Data(logs_path)

Assets/Scripts/IgnoreClipping.cs

@@ -3,7 +3,7 @@
 public class IgnoreClipping : MonoBehaviour
 {
     public int ignoreClippingLayer = 13;
-    public float preClippingDistance = 1000f;
+    public float preClippingDistance = 500f;
 
     public int smallObjectsLayer = 14;
     public float smallObjectsDistance = 200f;

Assets/Scripts/Sensors/BikeSensorData.cs

@@ -60,7 +60,7 @@ namespace Sensors
                     throw new InvalidConstraintException(
                         "BikeSensorData: Already listening to HR Sensor");
                 hrReceiver = new HrReceiver(hrAntId.Value);
-                //awaitDevices.Add(hrReceiver);
+                awaitDevices.Add(hrReceiver);
             }
 
             if (powermeterId != null)
@@ -69,7 +69,7 @@ namespace Sensors
                     throw new InvalidConstraintException(
                         "BikeSensorData: Already listening to Power Sensor");
                 powerMeterReceiver = new PowerMeterReceiver(powermeterId.Value);
-                //awaitDevices.Add(powerMeterReceiver);
+                awaitDevices.Add(powerMeterReceiver);
             }
 
             if (awaitDevices.Count > 0)

Assets/Scripts/Sensors/ListenToSensors.cs

@@ -8,13 +8,17 @@ namespace Sensors
     public class ListenToSensors : MonoBehaviour
     {
         public SpeedSensorConfig speedSensorConfig;
-        [FormerlySerializedAs("polarSensorConfig")] public BleSensorConfig bleSensorConfig;
+
+        [FormerlySerializedAs("polarSensorConfig")]
+        public BleSensorConfig bleSensorConfig;
+
         public int hrAntId;
         public int powerMeterId;
 
         private void Start()
         {
-            BikeSensorData.Instance.StartListening(speedSensorConfig, bleSensorConfig, powerMeterId,
+            BikeSensorData.Instance.StartListening(speedSensorConfig, bleSensorConfig,
+                powerMeterId < 0 ? null : new int?(powerMeterId),
                 hrAntId < 0 ? null : new int?(hrAntId));
         }