Details
diff --git a/bdi-jade-extensions/src/bdi4jade/extension/planselection/utilitybased/SoftgoalPreferences.java b/bdi-jade-extensions/src/bdi4jade/extension/planselection/utilitybased/SoftgoalPreferences.java
index 840bf49..6297d9a 100644
--- a/bdi-jade-extensions/src/bdi4jade/extension/planselection/utilitybased/SoftgoalPreferences.java
+++ b/bdi-jade-extensions/src/bdi4jade/extension/planselection/utilitybased/SoftgoalPreferences.java
@@ -37,7 +37,7 @@ import bdi4jade.goal.Softgoal;
public class SoftgoalPreferences extends
TransientBelief<String, Map<Softgoal, Double>> {
- public static final String NAME = SoftgoalPreferences.class.getSimpleName();
+ public static final String NAME = "SoftgoalPreferences";
private static final long serialVersionUID = 1802540697397519283L;
diff --git a/bdi-jade-test/src/bdi4jade/examples/planselection/ExperimentRunner.java b/bdi-jade-test/src/bdi4jade/examples/planselection/ExperimentRunner.java
index b5140d7..9d4888a 100644
--- a/bdi-jade-test/src/bdi4jade/examples/planselection/ExperimentRunner.java
+++ b/bdi-jade-test/src/bdi4jade/examples/planselection/ExperimentRunner.java
@@ -38,10 +38,10 @@ import org.apache.log4j.PropertyConfigurator;
import bdi4jade.event.GoalEvent;
import bdi4jade.event.GoalListener;
import bdi4jade.examples.BDI4JADEExamplesApp;
+import bdi4jade.examples.planselection.TransportationAgent.TransportationGoal;
/**
- * @author ingrid
- *
+ * @author Ingrid Nunes
*/
public class ExperimentRunner implements GoalListener {
diff --git a/bdi-jade-test/src/bdi4jade/examples/planselection/GenericValueFunction.java b/bdi-jade-test/src/bdi4jade/examples/planselection/GenericValueFunction.java
index ab8abe5..1ae045c 100644
--- a/bdi-jade-test/src/bdi4jade/examples/planselection/GenericValueFunction.java
+++ b/bdi-jade-test/src/bdi4jade/examples/planselection/GenericValueFunction.java
@@ -27,8 +27,7 @@ import java.util.Map;
import java.util.Set;
/**
- * @author ingrid
- *
+ * @author Ingrid Nunes
*/
public class GenericValueFunction<T> {
diff --git a/bdi-jade-test/src/bdi4jade/examples/planselection/Pair.java b/bdi-jade-test/src/bdi4jade/examples/planselection/Pair.java
index e6ca001..24afd7a 100644
--- a/bdi-jade-test/src/bdi4jade/examples/planselection/Pair.java
+++ b/bdi-jade-test/src/bdi4jade/examples/planselection/Pair.java
@@ -23,8 +23,7 @@
package bdi4jade.examples.planselection;
/**
- * @author ingridn
- *
+ * @author Ingrid Nunes
*/
public class Pair<T> extends PairT<T, T> {
diff --git a/bdi-jade-test/src/bdi4jade/examples/planselection/PairT.java b/bdi-jade-test/src/bdi4jade/examples/planselection/PairT.java
index 02e9524..111309d 100644
--- a/bdi-jade-test/src/bdi4jade/examples/planselection/PairT.java
+++ b/bdi-jade-test/src/bdi4jade/examples/planselection/PairT.java
@@ -23,8 +23,7 @@
package bdi4jade.examples.planselection;
/**
- * @author ingrid
- *
+ * @author Ingrid Nunes
*/
public class PairT<T1, T2> {
diff --git a/bdi-jade-test/src/bdi4jade/examples/planselection/Plans.java b/bdi-jade-test/src/bdi4jade/examples/planselection/Plans.java
index 161e131..c9f66d5 100644
--- a/bdi-jade-test/src/bdi4jade/examples/planselection/Plans.java
+++ b/bdi-jade-test/src/bdi4jade/examples/planselection/Plans.java
@@ -23,8 +23,7 @@
package bdi4jade.examples.planselection;
/**
- * @author ingrid
- *
+ * @author Ingrid Nunes
*/
public interface Plans {
diff --git a/bdi-jade-test/src/bdi4jade/examples/planselection/Softgoals.java b/bdi-jade-test/src/bdi4jade/examples/planselection/Softgoals.java
index cbad4b5..d8b740a 100644
--- a/bdi-jade-test/src/bdi4jade/examples/planselection/Softgoals.java
+++ b/bdi-jade-test/src/bdi4jade/examples/planselection/Softgoals.java
@@ -26,8 +26,7 @@ import bdi4jade.goal.NamedSoftgoal;
import bdi4jade.goal.Softgoal;
/**
- * @author ingrid
- *
+ * @author Ingrid Nunes
*/
public interface Softgoals {
diff --git a/bdi-jade-test/src/bdi4jade/examples/planselection/TransportationAgent.java b/bdi-jade-test/src/bdi4jade/examples/planselection/TransportationAgent.java
index 9db4fcd..26f805e 100644
--- a/bdi-jade-test/src/bdi4jade/examples/planselection/TransportationAgent.java
+++ b/bdi-jade-test/src/bdi4jade/examples/planselection/TransportationAgent.java
@@ -31,15 +31,21 @@ import bdi4jade.belief.TransientBelief;
import bdi4jade.core.SingleCapabilityAgent;
import bdi4jade.extension.planselection.utilitybased.SoftgoalPreferences;
import bdi4jade.extension.planselection.utilitybased.UtilityBasedCabability;
+import bdi4jade.goal.Goal;
import bdi4jade.goal.Softgoal;
import bdi4jade.plan.Plan;
/**
- * @author ingrid
- *
+ * @author Ingrid Nunes
*/
public class TransportationAgent extends SingleCapabilityAgent {
+ public static class TransportationGoal implements Goal {
+
+ private static final long serialVersionUID = 5008348479798066431L;
+
+ }
+
public static final String SATISFACTION = "Satisfaction";
static final long serialVersionUID = 2712019445290687786L;
diff --git a/bdi-jade-test/src/bdi4jade/examples/planselection/TransportationPlan.java b/bdi-jade-test/src/bdi4jade/examples/planselection/TransportationPlan.java
index 847aab5..1672712 100644
--- a/bdi-jade-test/src/bdi4jade/examples/planselection/TransportationPlan.java
+++ b/bdi-jade-test/src/bdi4jade/examples/planselection/TransportationPlan.java
@@ -27,14 +27,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import bdi4jade.examples.planselection.TransportationAgent.TransportationGoal;
import bdi4jade.extension.planselection.utilitybased.PlanContribution;
import bdi4jade.goal.GoalTemplateFactory;
import bdi4jade.goal.Softgoal;
import bdi4jade.plan.DefaultPlan;
/**
- * @author ingrid
- *
+ * @author Ingrid Nunes
*/
public class TransportationPlan extends DefaultPlan {
diff --git a/bdi-jade-test/src/bdi4jade/examples/planselection/TransportationPlanBody.java b/bdi-jade-test/src/bdi4jade/examples/planselection/TransportationPlanBody.java
index 191540c..681da6e 100644
--- a/bdi-jade-test/src/bdi4jade/examples/planselection/TransportationPlanBody.java
+++ b/bdi-jade-test/src/bdi4jade/examples/planselection/TransportationPlanBody.java
@@ -27,14 +27,13 @@ import java.util.Random;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import bdi4jade.belief.TransientBelief;
+import bdi4jade.annotation.Belief;
import bdi4jade.extension.planselection.utilitybased.SoftgoalPreferences;
import bdi4jade.plan.Plan.EndState;
import bdi4jade.plan.planbody.AbstractPlanBody;
/**
- * @author ingrid
- *
+ * @author Ingrid Nunes
*/
public class TransportationPlanBody extends AbstractPlanBody {
@@ -117,27 +116,24 @@ public class TransportationPlanBody extends AbstractPlanBody {
private Log log;
private TransportationPlan plan;
+ @Belief(name = SoftgoalPreferences.NAME)
private SoftgoalPreferences preferences;
- private GenericValueFunction<Integer> satisfaction;
+ @Belief(name = TransportationAgent.SATISFACTION)
+ private bdi4jade.belief.Belief<String, GenericValueFunction<Integer>> satisfaction;
public void action() {
log.debug("Plan executed: " + this.plan.getId());
Scenario scenario = new Scenario();
double satisfaction = scenario.getSatisfaction();
- this.satisfaction.addValue(this.satisfaction.getCount() + 1,
- satisfaction);
+ this.satisfaction.getValue().addValue(
+ this.satisfaction.getValue().getCount() + 1, satisfaction);
log.debug("Plan finished!");
setEndState(EndState.SUCCESSFUL);
}
- @SuppressWarnings("unchecked")
public void onStart() {
this.log = LogFactory.getLog(this.getClass());
this.plan = (TransportationPlan) getPlan();
- this.satisfaction = ((TransientBelief<String, GenericValueFunction<Integer>>) getBeliefBase()
- .getBelief(TransportationAgent.SATISFACTION)).getValue();
- this.preferences = (SoftgoalPreferences) getBeliefBase().getBelief(
- SoftgoalPreferences.NAME);
}
}
diff --git a/bdi-jade-test/src/bdi4jade/examples/template/goal/MyGoal.java b/bdi-jade-test/src/bdi4jade/examples/template/goal/MyGoal.java
index 129724b..c4a110a 100644
--- a/bdi-jade-test/src/bdi4jade/examples/template/goal/MyGoal.java
+++ b/bdi-jade-test/src/bdi4jade/examples/template/goal/MyGoal.java
@@ -23,7 +23,7 @@
package bdi4jade.examples.template.goal;
import bdi4jade.annotation.GoalOwner;
-import bdi4jade.examples.template.MyCapability;
+import bdi4jade.examples.planselection.template.MyCapability;
import bdi4jade.goal.Goal;
/**
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 7f63b7b..288012d 100644
--- a/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan1.java
+++ b/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan1.java
@@ -27,7 +27,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import bdi4jade.examples.template.MyAgentSoftgoals;
+import bdi4jade.examples.planselection.template.MyAgentSoftgoals;
import bdi4jade.examples.template.goal.MyGoal;
import bdi4jade.extension.planselection.utilitybased.PlanContribution;
import bdi4jade.goal.Softgoal;
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 82e313c..8f26fa5 100644
--- a/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan2.java
+++ b/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan2.java
@@ -27,7 +27,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import bdi4jade.examples.template.MyAgentSoftgoals;
+import bdi4jade.examples.planselection.template.MyAgentSoftgoals;
import bdi4jade.examples.template.goal.MyGoal;
import bdi4jade.extension.planselection.utilitybased.PlanContribution;
import bdi4jade.goal.Softgoal;
