Cleaning before pulling in Michael's stuff

andrewgdunn · Aug 9, 2010 · 857dd82 · 857dd82
1 parent dc39bcd
commit 857dd82
Show file tree

Hide file tree

Showing 18 changed files with 14 additions and 1,705 deletions.
diff --git a/aDA/da/DiagnosticAlgorithm.java b/aDA/da/DiagnosticAlgorithm.java
@@ -82,7 +82,8 @@ else if (dxcData instanceof ErrorData) {
             while (isRun) {
                 Thread.sleep(threadSleep);
             }
-        } catch (Exception ex) {
+        } 
+		catch (Exception ex) {
             System.out.append(ex.toString() + " " + ex.getMessage());
         }
     }
@@ -92,15 +93,20 @@ private static void ProcessRecievedData() {
 
         for(Object keySet : allSensors.keySet()) {
         	Sensor individualSensor = (Sensor)allSensors.get(keySet);
-        	Map<String, Value> map = ErrorFinder.errorParams(individualSensor);
-        	if(map.containsKey("faultIndex")) {
-        		map.put("FaultTime", Value.v(individualSensor.timestamps.elementAt( ((IntegerValue)(map.get("faultIndex"))).get() ) - individualSensor.timestamps.elementAt(0) ) );
-        		map.remove("faultIndex");
+
+        	/** Send the individual sensor to our filters, if there is a detected error we will
+        	 *  make sure to set the falutIndex. 
+        	 */
+        	Map<String, Value> filterSensor = ErrorFinder.errorParams(individualSensor);
+
+        	if(filterSensor.containsKey("faultIndex")) {
+        		filterSensor.put("FaultTime", Value.v(individualSensor.timestamps.elementAt( ((IntegerValue)(filterSensor.get("faultIndex"))).get() ) - individualSensor.timestamps.elementAt(0) ) );
+        		filterSensor.remove("faultIndex");
         		System.out.println(individualSensor.id + ":");
-        		map.put("sensorId", Value.v(individualSensor.id));
-        		errorSensors.add(map);
+        		filterSensor.put("sensorId", Value.v(individualSensor.id));
+        		errorSensors.add(filterSensor);
         	}        		
-        	printMap(map);
+        	printMap(filterSensor);
         }
 
         // based on which sensors found faults, determine which component is problematic

diff --git a/filterAlgorithms/Exp_1127_020f_pb_ADAPT-Lite.mat b/filterAlgorithms/Exp_1127_020f_pb_ADAPT-Lite.mat
diff --git a/filterAlgorithms/Exp_1127_026f_pb_ADAPT-Lite.mat b/filterAlgorithms/Exp_1127_026f_pb_ADAPT-Lite.mat
diff --git a/filterAlgorithms/Exp_1127_032f_pb_ADAPT-Lite.mat b/filterAlgorithms/Exp_1127_032f_pb_ADAPT-Lite.mat
diff --git a/filterAlgorithms/Exp_1151_pb_ADAPT-Lite.mat b/filterAlgorithms/Exp_1151_pb_ADAPT-Lite.mat
diff --git a/filterAlgorithms/KF_RULE_number_points_above_std.m b/filterAlgorithms/KF_RULE_number_points_above_std.m