Refactoring

jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Condition.java

@@ -30,5 +30,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface Condition {
-	double value() default 0.0;
+	String value() default "";
 }

jdeeco-core/src/cz/cuni/mff/d3s/deeco/processor/ConditionParser.java

@@ -19,6 +19,7 @@ public static List<BooleanCondition> parseBooleanConditions(Class<?> c) {
 		assert (c != null);
 		List<BooleanCondition> result = new LinkedList<>();
 		List<Parameter> parameters;
+		String id;
 		for (Method m : getAnnotatedMethods(c, Condition.class)) {
 			if (m == null) {
 				continue;
@@ -33,7 +34,8 @@ public static List<BooleanCondition> parseBooleanConditions(Class<?> c) {
 			} catch (ParametersParseException cepe) {
 				continue;
 			}
-			result.add(new BooleanCondition(parameters, m));
+			id = m.getAnnotation(Condition.class).value();
+			result.add(new BooleanCondition(id, parameters, m));
 		}
 		return result;
 	}

jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/model/BooleanCondition.java

@@ -5,11 +5,20 @@
 
 public class BooleanCondition extends Invocable {
 
-	public BooleanCondition(List<Parameter> parameters, Method method) {
+	private final String id;
+
+	public BooleanCondition(String id, List<Parameter> parameters, Method method) {
 		super(parameters, method, LockingMode.STRONG);
+		this.id = id;
 	}
 
-	public BooleanCondition(Method method) {
+	public BooleanCondition(String id, Method method) {
 		super(method, LockingMode.STRONG);
+		this.id = id;
 	}
+
+	public String getId() {
+		return id;
+	}
+
 }

jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/model/KnowledgePath.java

@@ -2,6 +2,7 @@
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
 import cz.cuni.mff.d3s.deeco.exceptions.KMException;
 import cz.cuni.mff.d3s.deeco.knowledge.ISession;
@@ -25,11 +26,11 @@ public KnowledgePath() {
 	public List<PathNode> getNodes() {
 		return nodes;
 	}
-	
+
 	public void addNode(PathNode node) {
 		nodes.add(node);
 	}
-	
+
 	public void join(KnowledgePath knowledgePath) {
 		nodes.addAll(knowledgePath.getNodes());
 	}
@@ -38,14 +39,51 @@ public String getEvaluatedPath(KnowledgeManager km, String coord,
 			String member, String prepend, ISession session) {
 		try {
 			if (prepend != null && !prepend.equals(""))
-				return prepend + PathGrammar.PATH_SEPARATOR + evaluate(this, km, coord, member, session);
+				return prepend + PathGrammar.PATH_SEPARATOR
+						+ evaluate(this, km, coord, member, session);
 			else
 				return evaluate(this, km, coord, member, session);
 		} catch (KMException kme) {
 			Log.e("Knowledge path evaluation error", kme);
 			return null;
 		}
+	}
 
+	public String getEvaluatedPath(KnowledgeManager km,
+			Map<String, String> replaceFromTo, ISession session) {
+		try {
+			return evaluate(this, km, replaceFromTo, session);
+		} catch (KMException kme) {
+			Log.e("Knowledge path evaluation error", kme);
+			return null;
+		}
+	}
+
+	private String evaluate(KnowledgePath kp, KnowledgeManager km,
+			Map<String, String> replaceFromTo, ISession session)
+			throws KMException {
+		StringBuilder builder = new StringBuilder();
+		for (PathNode pn : kp.getNodes()) {
+			if (pn instanceof PathNodeField) {
+				PathNodeField pnf = (PathNodeField) pn;
+				if (replaceFromTo.containsKey(pnf.getName()))
+					builder.append(replaceFromTo.get(pnf.getName()));
+				else
+					builder.append(pnf.getName());
+			} else {
+				PathNodeMapKey pnmk = (PathNodeMapKey) pn;
+				String evaluation = evaluate(pnmk.getKeyPath(), km,
+						replaceFromTo, session);
+				Object o = km.getKnowledge(evaluation, session);
+				if (o instanceof Object[] && ((Object[]) o).length == 1)
+					builder.append((String) ((Object[]) o)[0]);
+				else
+					builder.append((String) o);
+			}
+			builder.append(PathGrammar.PATH_SEPARATOR);
+		}
+		builder.replace(builder.length() - 1, builder.length(), "");
+		return builder.toString();
 	}
 
 	private String evaluate(KnowledgePath kp, KnowledgeManager km,

jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduling/EnsembleJob.java

@@ -26,7 +26,7 @@ public EnsembleJob(Ensemble ensemble, String coordinator, String member,
 		this.coordinator = coordinator;
 		this.member = member;
 		this.schedule = ensemble.getSchedule();
-		this.id = ensemble.getId();
+		this.id = coordinator + member + ensemble.getId();
 	}
 
 	@Override