fixed Double Filter

core/tools.descartes.dql.core.engine/src/tools/descartes/dql/core/engine/whatif/DoubleFilter.java

@@ -31,7 +31,9 @@ import java.util.Iterator;
 import tools.descartes.dql.models.mapping.domain.DecimalResult;
 import tools.descartes.dql.models.mapping.domain.Probe;
 import tools.descartes.dql.models.mapping.domain.Resource;
+import tools.descartes.dql.models.mapping.domain.Result;
 import tools.descartes.dql.models.mapping.domain.Service;
+import tools.descartes.dql.models.mapping.domain.StatType;
 import tools.descartes.dql.models.mapping.mapping.EntityMapping;
 
 public class DoubleFilter implements WhatIfFilter {
@@ -53,24 +55,24 @@ public class DoubleFilter implements WhatIfFilter {
 				Resource resource = resourceIterator.next();
 				for (Iterator<Probe> probeIterator = resource.getProbes().iterator(); probeIterator.hasNext();) {
 					Probe probe = probeIterator.next();
-					if (probe instanceof DecimalResult) {
-						DecimalResult modifiedResult = (DecimalResult) probe;
-						DecimalResult initialResult = getResult(initial, resource.getIdentifier(),
-								probe.getMetricName());
-
-						if (modifier) {
-							if (filterWithModifier(modifiedResult, initialResult))
-								probeIterator.remove();
-
-						} else if (filterWithoutModifier(modifiedResult, initialResult))
-							probeIterator.remove();
-					} else {
-						probeIterator.remove();
+					for (Iterator<StatType> statIterator = probe.getStatTypes().iterator(); statIterator.hasNext();) {
+						Result r = statIterator.next().getResult();
+						if (r != null && r instanceof DecimalResult) {
+							DecimalResult modifiedResult = (DecimalResult) r;
+							DecimalResult initialResult = getResult(initial, resource.getIdentifier(),
+									probe.getMetricName());
+
+							if (modifier) {
+								if (filterWithModifier(modifiedResult, initialResult))
+									statIterator.remove();
+							} else if (filterWithoutModifier(modifiedResult, initialResult))
+								statIterator.remove();
+						}
 					}
-
+					if (probe.getStatTypes().isEmpty())
+						probeIterator.remove();
 				}
-
-				if (resource.getProbes().isEmpty())
+				if (resource.getProbes().isEmpty()) 
 					resourceIterator.remove();
 			}
 			// checking all Services
@@ -78,23 +80,23 @@ public class DoubleFilter implements WhatIfFilter {
 				Service service = serviceIterator.next();
 				for (Iterator<Probe> probeIterator = service.getProbes().iterator(); probeIterator.hasNext();) {
 					Probe probe = probeIterator.next();
-					if (probe instanceof DecimalResult) {
-						DecimalResult modifiedResult = (DecimalResult) probe;
-						DecimalResult initialResult = getResult(initial, service.getIdentifier(),
-								probe.getMetricName());
-
-						if (modifier) {
-							if (filterWithModifier(modifiedResult, initialResult))
-								probeIterator.remove();
-
-						} else if (filterWithoutModifier(modifiedResult, initialResult))
-							probeIterator.remove();
-					} else {
-						probeIterator.remove();
+					for (Iterator<StatType> statIterator = probe.getStatTypes().iterator(); statIterator.hasNext();) {
+						Result r = statIterator.next().getResult();
+						if (r != null && r instanceof DecimalResult) {
+							DecimalResult modifiedResult = (DecimalResult) r;
+							DecimalResult initialResult = getResult(initial, service.getIdentifier(),
+									probe.getMetricName());
+
+							if (modifier) {
+								if (filterWithModifier(modifiedResult, initialResult))
+									statIterator.remove();
+							} else if (filterWithoutModifier(modifiedResult, initialResult))
+								statIterator.remove();
+						}
 					}
-
+					if (probe.getStatTypes().isEmpty())
+						probeIterator.remove();
 				}
-
 				if (service.getProbes().isEmpty())
 					serviceIterator.remove();
 			}