fixed SLA generation: DiscreteSeriesResult ==> AbstractSeriesResult

core/tools.descartes.dql.core.engine/src/tools/descartes/dql/core/engine/interpreter/SLAGeneratorInterpreter.java

@@ -57,8 +57,8 @@ import tools.descartes.dql.lang.descartesQL.ModelReferenceClause;
 import tools.descartes.dql.lang.descartesQL.MultipleArithmeticClause;
 import tools.descartes.dql.lang.descartesQL.PerformanceMetricsQuery;
 import tools.descartes.dql.lang.descartesQL.UsingClause;
+import tools.descartes.dql.models.mapping.domain.AbstractSeriesResult;
 import tools.descartes.dql.models.mapping.domain.DecimalResult;
-import tools.descartes.dql.models.mapping.domain.DiscreteSeriesResult;
 import tools.descartes.dql.models.mapping.domain.Entity;
 import tools.descartes.dql.models.mapping.domain.Result;
 import tools.descartes.dql.models.mapping.domain.SeriesResultElement;
@@ -151,9 +151,7 @@ public class SLAGeneratorInterpreter
 		metricsQuerySB.append("SELECT\n");
 		for (EntityReference er : generateSLAConcern.getForClause().getEntityReferenceClause().getEntityReferences()) {
 			if (er.getType().equalsIgnoreCase("SERVICE")) {
-				metricsQuerySB.append("\t" + er.getAlias().getAlias() + "." + "responseTime" + ",\n");
-				// + "responseTime95thPerc" + ",\n");
-				// + "responseTime99thPerc" + ",\n");
+				metricsQuerySB.append("\t" + er.getAlias().getAlias() + "." + "responseTime"+ ",\n");
 			}
 		}
 		metricsQuerySB.deleteCharAt(metricsQuerySB.length() - 2); // remove last comma
@@ -213,12 +211,12 @@ public class SLAGeneratorInterpreter
 		double value = 0.0;
 		for (Entity ent : result.getEntities()) {
 			Result subresult = ent.getProbes().get(0).getStatTypes().get(0).getResult();
-			if (subresult instanceof DiscreteSeriesResult) {
+			if (subresult instanceof AbstractSeriesResult) {
 				value = 0.0;
-				for (SeriesResultElement elem : ((DiscreteSeriesResult) subresult).getElements()) {
+				for (SeriesResultElement elem : ((AbstractSeriesResult) subresult).getElements()) {
 					value = Math.max(value, elem.getY().doubleValue());
 				}
-				value = getPercentile((DiscreteSeriesResult) subresult, satisfactionLevel);
+				value = getPercentile((AbstractSeriesResult) subresult, satisfactionLevel);
 			} else if (subresult instanceof DecimalResult) {
 				value = (((DecimalResult) subresult).getValue()).doubleValue();
 			}
@@ -256,7 +254,7 @@ public class SLAGeneratorInterpreter
 		return slaString.toString();
 	}
 
-	private double getPercentile(DiscreteSeriesResult subresult, double percent) {
+	private double getPercentile(AbstractSeriesResult subresult, double percent) {
 		EList<SeriesResultElement> list = subresult.getElements();
 		EList<SeriesResultElement> list2 = EcoreUtil.copy(subresult).getElements();
 		sort(list2);