CorrelationMetadataWrapper can be instantiated with given timestamp.

Don't classify distances that are Double.NaN.

Author: iridin

.classpath

@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

src/cz/cuni/mff/d3s/metaadaptation/correlation/CorrelationManager.java

@@ -164,6 +164,10 @@ public void monitor() {
 				// ignore fields that are not specified as CorrelationMetadataWrapper instances
 				if (o instanceof CorrelationMetadataWrapper) {
 					addFieldToHistory(memberKnowledgeHistory, (CorrelationMetadataWrapper<?>) o);
+				} else if(dumpValues){
+					System.out.println(String.format(
+							"Correlation manager is ignoring the field \"%s\" because it is not an instance of \"%s\"",
+							knowlegeField, CorrelationMetadataWrapper.class.getName()));
 				}
 			}
 		}
@@ -480,7 +484,9 @@ private List<DistancePair> computeDistances(
 						labels.getSecondLabel(),
 						knowledge.c1Value2.getValue(),
 						knowledge.c2Value2.getValue());
-				distancePairs.add(new DistancePair(distance, distanceClass, knowledge.c1Value1.getTimestamp()));
+				if(!Double.isNaN(distance) && distanceClass != DistanceClass.Undefined) {
+					distancePairs.add(new DistancePair(distance, distanceClass, knowledge.c1Value1.getTimestamp()));
+				}
 			}
 		}
 

src/cz/cuni/mff/d3s/metaadaptation/correlation/CorrelationMetadataWrapper.java

@@ -40,9 +40,18 @@ public class CorrelationMetadataWrapper<T> implements Serializable{
 	 * @param value The knowledge field value to be wrapped.
 	 */
 	public CorrelationMetadataWrapper(T value, String name){
+		this(value, name, 0);
+	}
+	
+	/**
+	 * Wrap the knowledge field value into the {@link CorrelationMetadataWrapper}.
+	 * The wrapper is created with the timestamp = 0 and operational = true.
+	 * @param value The knowledge field value to be wrapped.
+	 */
+	public CorrelationMetadataWrapper(T value, String name, long time){
 		this.value = value;
 		this.name = name;
-		timestamp = 0;
+		timestamp = time;
 		operational = true;
 	}
 
@@ -94,5 +103,10 @@ public boolean isOperational(){
 	public void malfunction(){
 		operational = false;	
 	}
+	
+	@Override
+	public String toString() {
+		return String.format("(%s:%s:%d:%s)", name, value, timestamp, operational ? "o" : "f");
+	}
 
 }

src/cz/cuni/mff/d3s/metaadaptation/correlation/KnowledgeMetadataHolder.java

@@ -170,8 +170,12 @@ public static DistanceClass classifyDistance(String label, Object value1, Object
 		if(containsLabel(label)){
 			Metric metric = getMetric(label);
 			double bound = getBound(label);
+			double distance = metric.distance(value1, value2);
 
-			if(metric.distance(value1, value2) <= bound){
+			if(Double.isNaN(distance)) {
+				return DistanceClass.Undefined;
+			}
+			if(distance <= bound){
 				return DistanceClass.Close;
 			}
 			else{