diff --git a/src/component/event/bdi/BeliefRemoved.js b/src/component/event/bdi/BeliefRemoved.js index 1848e8a..1681f84 100644 --- a/src/component/event/bdi/BeliefRemoved.js +++ b/src/component/event/bdi/BeliefRemoved.js @@ -15,7 +15,7 @@ function BDIBeliefRemoved(props) { if (intention) { const intentionInfo = intention.message.event.intentionInfo - reason = " because of intention " + intentionInfo.intendedMeansInfo[0].trigger + "/" + intentionInfo.id + reason = " because of intention " + intentionInfo.id + " " + intentionInfo.intendedMeansInfo[0].trigger } if (!beliefAdded && !(beliefDeed && beliefDeed.message.type === "ExecutedDeed" && beliefDeed.message.event.deedInfo.type === "delAddBel" && beliefDeed.message.event.deedInfo.term.includes(beliefEvent.functor))) { diff --git a/src/component/event/bdi/DesireCommitted.js b/src/component/event/bdi/DesireCommitted.js index f766948..e8d900c 100644 --- a/src/component/event/bdi/DesireCommitted.js +++ b/src/component/event/bdi/DesireCommitted.js @@ -15,10 +15,10 @@ function DesireCommitted(props) { const body = selectedPlan.body ? "Plan body: " + selectedPlan.body : "" const im = intention.message.event.intentionInfo.intendedMeansInfo const id = intention.message.event.intentionInfo.id - const description = "I committed to desire " + desire + context + ", and it became a new intention " + im[0].trigger + "/" + id + const description = "I committed to desire " + desire + context + ", and it became a new intention " + id + " " + im[0].trigger let reason = getIntentionReason(desire, intention.message.event.intentionInfo) - let parentDesire = reason ? ["Intention " + im[0].trigger + "/" + id + " is an intention" + reason,
] : [] + let parentDesire = reason ? ["Intention " + id + " " + im[0].trigger + " is an intention" + reason,
] : [] if (agentState.intention[id]) { agentState.intention[id].push(desire) diff --git a/src/component/event/bdi/DesireRemoved.js b/src/component/event/bdi/DesireRemoved.js index 888371e..ab2eb67 100644 --- a/src/component/event/bdi/DesireRemoved.js +++ b/src/component/event/bdi/DesireRemoved.js @@ -21,13 +21,13 @@ function DesireRemoved(props) { if (im.length > 0) { let reason = getIntentionReason(functor, intention) - parentDesire = reason ? ["Intention " + functor + "/" + id + " is an intention" + reason,
] : [] + parentDesire = reason ? ["Intention " + id + " " + functor + " is an intention" + reason,
] : [] } } else { id = Object.keys(agentState.intention).find(key => agentState.intention[key].includes(functor)) } - let intentionInfo = "intention " + functor.split('(')[0] + "/" + id + let intentionInfo = "intention " + id + " " + functor.split('(')[0] if (result === "achieved") { type = "Desire satisfied"; description = "I have satisfied my desire " + functor + " because its " + intentionInfo + " has finished" diff --git a/src/component/event/bdi/ExecutedAction.js b/src/component/event/bdi/ExecutedAction.js index 3a25aa8..05fba3e 100644 --- a/src/component/event/bdi/ExecutedAction.js +++ b/src/component/event/bdi/ExecutedAction.js @@ -45,7 +45,7 @@ function ExecutedAction(props) { break; } - intention = "intention " + intentionTrigger + "/" + intentionId + intention = "intention " + intentionId + " " + intentionTrigger description = description + deed.term + " because of " + intention info = info + deed.type diff --git a/src/component/event/bdi/NewBelief.js b/src/component/event/bdi/NewBelief.js index 6dd8c92..f0f96fa 100644 --- a/src/component/event/bdi/NewBelief.js +++ b/src/component/event/bdi/NewBelief.js @@ -22,10 +22,10 @@ function NewBelief(props) { if (beliefDeed) { const intentionInfo = beliefDeed.message.event.intentionInfo.value if (intentionInfo) { - intention = intentionInfo.intendedMeansInfo[0].trigger + "/" + intentionInfo.id + intention = intentionInfo.id + " " + intentionInfo.intendedMeansInfo[0].trigger } else { const intentionEvent = props.log.slice(0, props.log.indexOf(props.event)).find(e => e.message.type === "IntentionCreated" && e.message.event.intentionInfo.intendedMeansInfo[0].plan.body.includes(belief)).message.event.intentionInfo; - intention = intentionEvent.intendedMeansInfo[0].trigger + "/" + intentionEvent.id + intention = intentionEvent.id + " " + intentionEvent.intendedMeansInfo[0].trigger } reason = " because of intention " + intention } else { diff --git a/src/model/agentState.js b/src/model/agentState.js index 1ce8be5..33891c1 100644 --- a/src/model/agentState.js +++ b/src/model/agentState.js @@ -26,13 +26,13 @@ export function getIntentionReason(desire, intentionInfo) { } else if (agentState.speechAct.tell.includes(parent)) { reason = " created from " + parent + " message" } else if (agentState.speechAct.achieve.includes(parent)) { - reason = " created from intention " + parent + "/" + id + reason = " created from intention " + id + " " + parent } else if (agentState.belief.self.includes(parent)) { reason = " formed from the belief " + parent } else if (agentState.belief.percept.includes(parent)) { reason = " created from the perception of " + parent } else if (agentState.intention[id] && agentState.intention[id].includes(parent)) { - reason = " created from intention " + parent + "/" + id + reason = " created from intention " + id + " " + parent } }