bdi4jade

Details

diff --git a/bdi-jade-test/src/bdi4jade/examples/template/MyAgent.java b/bdi-jade-test/src/bdi4jade/examples/template/MyAgent.java
index dd17d0c..8862600 100644
--- a/bdi-jade-test/src/bdi4jade/examples/template/MyAgent.java
+++ b/bdi-jade-test/src/bdi4jade/examples/template/MyAgent.java
@@ -42,7 +42,7 @@ public class MyAgent extends UtilityBasedBDIAgent {
 	}
 
 	protected void init() {
-		for (Softgoal softgoal : Constants.ALL_SOFTGOALS) {
+		for (Softgoal softgoal : MyAgentSoftgoals.ALL_SOFTGOALS) {
 			this.addSoftgoal(softgoal);
 		}
 
@@ -59,8 +59,8 @@ public class MyAgent extends UtilityBasedBDIAgent {
 				.getRootCapability().getBeliefBase()
 				.getBelief(SoftgoalPreferences.NAME);
 
-		preferences.setPreferenceForSoftgoal(Constants.Softgoal1, 0.1);
-		preferences.setPreferenceForSoftgoal(Constants.Softgoal2, 0.2);
+		preferences.setPreferenceForSoftgoal(MyAgentSoftgoals.Softgoal1, 0.3);
+		preferences.setPreferenceForSoftgoal(MyAgentSoftgoals.Softgoal2, 0.7);
 
 	}
 
diff --git a/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan1.java b/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan1.java
index b1b2b68..a6eed63 100644
--- a/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan1.java
+++ b/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan1.java
@@ -26,8 +26,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import bdi4jade.examples.planselection.Softgoals;
-import bdi4jade.examples.template.Constants;
+import bdi4jade.examples.template.MyAgentSoftgoals;
 import bdi4jade.examples.template.goal.MyGoal;
 import bdi4jade.plan.PlanContribution;
 import bdi4jade.softgoal.Softgoal;
@@ -43,18 +42,17 @@ public class MyPlan1 extends SimplePlan {
 		super(MyGoal.class, MyPlan1Body.class);
 
 		Map<Softgoal, List<PlanContribution>> contributions = (Map<Softgoal, List<PlanContribution>>) getMetadata(DefaultMetadata.CONTRIBUTIONS);
-
 		List<PlanContribution> sgContributions = null;
 
 		sgContributions = new ArrayList<PlanContribution>();
-		sgContributions.add(new PlanContribution(Constants.Softgoal1, 0.6, 0.0));
-		sgContributions.add(new PlanContribution(Constants.Softgoal2, 0.4, 1.0));
-		contributions.put(Softgoals.SAFETY, sgContributions);
+		sgContributions.add(new PlanContribution(MyAgentSoftgoals.Softgoal1, 0.6, 0.0));
+		sgContributions.add(new PlanContribution(MyAgentSoftgoals.Softgoal1, 0.4, 1.0));
+		contributions.put(MyAgentSoftgoals.Softgoal1, sgContributions);
 
 		sgContributions = new ArrayList<PlanContribution>();
-		sgContributions.add(new PlanContribution(Constants.Softgoal1, 0.2, 0.0));
-		sgContributions.add(new PlanContribution(Constants.Softgoal2, 0.8, 1.0));
-		contributions.put(Softgoals.PERFORMANCE, sgContributions);
+		sgContributions.add(new PlanContribution(MyAgentSoftgoals.Softgoal2, 0.2, 0.0));
+		sgContributions.add(new PlanContribution(MyAgentSoftgoals.Softgoal2, 0.8, 1.0));
+		contributions.put(MyAgentSoftgoals.Softgoal2, sgContributions);
 	}
 
 }
\ No newline at end of file
diff --git a/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan2.java b/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan2.java
index 5863cf2..e1e4b8d 100644
--- a/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan2.java
+++ b/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan2.java
@@ -26,8 +26,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import bdi4jade.examples.planselection.Softgoals;
-import bdi4jade.examples.template.Constants;
+import bdi4jade.examples.template.MyAgentSoftgoals;
 import bdi4jade.examples.template.goal.MyGoal;
 import bdi4jade.plan.PlanContribution;
 import bdi4jade.softgoal.Softgoal;
@@ -46,14 +45,14 @@ public class MyPlan2 extends SimplePlan {
 		List<PlanContribution> sgContributions = null;
 
 		sgContributions = new ArrayList<PlanContribution>();
-		sgContributions.add(new PlanContribution(Constants.Softgoal1, 0.3, 0.0));
-		sgContributions.add(new PlanContribution(Constants.Softgoal2, 0.7, 1.0));
-		contributions.put(Softgoals.SAFETY, sgContributions);
+		sgContributions.add(new PlanContribution(MyAgentSoftgoals.Softgoal1, 0.3, 0.0));
+		sgContributions.add(new PlanContribution(MyAgentSoftgoals.Softgoal1, 0.7, 1.0));
+		contributions.put(MyAgentSoftgoals.Softgoal1, sgContributions);
 
 		sgContributions = new ArrayList<PlanContribution>();
-		sgContributions.add(new PlanContribution(Constants.Softgoal1, 0.5, 0.0));
-		sgContributions.add(new PlanContribution(Constants.Softgoal2, 0.5, 1.0));
-		contributions.put(Softgoals.PERFORMANCE, sgContributions);
+		sgContributions.add(new PlanContribution(MyAgentSoftgoals.Softgoal2, 0.5, 0.0));
+		sgContributions.add(new PlanContribution(MyAgentSoftgoals.Softgoal2, 0.5, 1.0));
+		contributions.put(MyAgentSoftgoals.Softgoal2, sgContributions);
 	}
 
 }
\ No newline at end of file