refactor: add trigger in the intention info

yan-elena · May 6, 2024 · 892624a · 892624a
1 parent ae10709
commit 892624a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/java/event/eventInfo/IntentionInfo.java b/src/java/event/eventInfo/IntentionInfo.java
@@ -14,6 +14,9 @@ public class IntentionInfo {
     private final Intention.State state;
     private final LinkedList<IntendedMeansInfo> intendedMeansInfo;
 
+    private final String trigger;
+
+
     /**
      * Creates a new instance of {@link IntentionInfo} from the given intention.
      * @param intention the intention of the agent
@@ -25,6 +28,7 @@ public IntentionInfo(Intention intention) {
         intendedMeansInfo = new LinkedList<>();
         intention.spliterator().forEachRemaining(intendedMeans -> intendedMeansInfo.add(new IntendedMeansInfo(intendedMeans)));
 
+        trigger = !intendedMeansInfo.isEmpty() ? intendedMeansInfo.getFirst().getPlan().getTrigger() : "";
     }
 
     /**
@@ -51,4 +55,11 @@ public Intention.State getState() {
         return state;
     }
 
+    /**
+     * Returns the trigger of the intention
+     * @return trigger
+     */
+    public String getTrigger() {
+        return trigger;
+    }
 }
diff --git a/src/java/event/intentionEvent/IntentionEvent.java b/src/java/event/intentionEvent/IntentionEvent.java
@@ -40,7 +40,7 @@ public IntentionEvent(Intention intention, Term reason) {
     public String logEvent() {
         Optional<IntendedMeansInfo> intendedMeans = intentionInfo.peekFirstIntendedMeans();
         return "Intention " + intentionInfo.getId() +
-                intendedMeans.map(im -> " "  + im.getTrigger()).orElse("") +
+                intendedMeans.map(im -> " "  + im.getPlan().getTrigger()).orElse("") +
                 " "  + getEventMessage() + this.reasonInfo.map(ReasonInfo::toString).orElse("") +
                 ", state: " + intentionInfo.getState() +
                 "\n\tcurrent step: " + intendedMeans.map(im ->