Changeset 957 for AgentMind/branches/FAtiMA-Modular/FAtiMA.culture/src/FAtiMA

Timestamp:

02/13/2011 12:41:28 PM (10 years ago)

Author:

joao.dias

Message:

 

Location:

AgentMind/branches/FAtiMA-Modular/FAtiMA.culture/src/FAtiMA/culture

Files:

• CulturalDimensionsComponent.java (modified) (11 diffs)
• CultureLoaderHandler.java (modified) (5 diffs)
• Ritual.java (modified) (2 diffs)

AgentMind/branches/FAtiMA-Modular/FAtiMA.culture/src/FAtiMA/culture/CulturalDimensionsComponent.java

@@ -15 +15 @@
 import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent;
 import FAtiMA.Core.conditions.Condition;
-import FAtiMA.Core.deliberativeLayer.DeliberativeProcess;
-import FAtiMA.Core.deliberativeLayer.IExpectedUtilityStrategy;
-import FAtiMA.Core.deliberativeLayer.IGetUtilityForOthers;
-import FAtiMA.Core.deliberativeLayer.IOptionsStrategy;
-import FAtiMA.Core.deliberativeLayer.IUtilityStrategy;
-import FAtiMA.Core.deliberativeLayer.Intention;
-import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal;
 import FAtiMA.Core.emotionalState.AppraisalFrame;
+import FAtiMA.Core.goals.ActivePursuitGoal;
 import FAtiMA.Core.sensorEffector.Event;
 import FAtiMA.Core.util.AgentLogger;
@@ -29 +23 @@
 import FAtiMA.Core.wellFormedNames.SubstitutionSet;
 import FAtiMA.Core.wellFormedNames.Symbol;
+import FAtiMA.DeliberativeComponent.DeliberativeComponent;
+import FAtiMA.DeliberativeComponent.IExpectedUtilityStrategy;
+import FAtiMA.DeliberativeComponent.IGetUtilityForOthers;
+import FAtiMA.DeliberativeComponent.IOptionsStrategy;
+import FAtiMA.DeliberativeComponent.IUtilityStrategy;
+import FAtiMA.DeliberativeComponent.Intention;
 
 
@@ -58 +58 @@
         @Override
         public void initialize(AgentModel aM){
-                DeliberativeProcess dp = (DeliberativeProcess) aM.getComponent(DeliberativeProcess.NAME);
+                DeliberativeComponent dc = (DeliberativeComponent) aM.getComponent(DeliberativeComponent.NAME);
                 this.loadCulture(aM);
-                dp.addOptionsStrategy(this);
-                dp.setExpectedUtilityStrategy(this);
+                dc.addOptionsStrategy(this);
+                dc.setExpectedUtilityStrategy(this);
                 aM.getRemoteAgent().setProcessActionStrategy(new CultureProcessActionStrategy());
         }
@@ -113 +113 @@
                 Ritual r2, r3;
                 String ritualName;
-                DeliberativeProcess dp = (DeliberativeProcess) am.getComponent(DeliberativeProcess.NAME);
+                DeliberativeComponent dc = (DeliberativeComponent) am.getComponent(DeliberativeComponent.NAME);
                 
                 //this section detects if a ritual has started with another agent's action
@@ -141 +141 @@
                                                                 ritualName = r3.getNameWithCharactersOrdered();
                                                                 r3.setUrgency(2);
-                                                                if(!_ritualOptions.containsKey(ritualName) && !dp.containsIntention(r3))
+                                                                if(!_ritualOptions.containsKey(ritualName) && !dc.containsIntention(r3))
                                                                 {
                                                                         AgentLogger.GetInstance().logAndPrint("Reactive Activation of a Ritual:" + r3.getName());
@@ -163 +163 @@
         private void loadCulture(AgentModel aM){
                 
-                DeliberativeProcess dp = (DeliberativeProcess) aM.getComponent(DeliberativeProcess.NAME);
+                DeliberativeComponent dp = (DeliberativeComponent) aM.getComponent(DeliberativeComponent.NAME);
 
                 AgentLogger.GetInstance().log("LOADING Culture: " + this.cultureFile);
@@ -281 +281 @@
         public Collection<? extends ActivePursuitGoal> options(AgentModel am) {
                 
-                DeliberativeProcess dp = (DeliberativeProcess) am.getComponent(DeliberativeProcess.NAME);
+                DeliberativeComponent dc = (DeliberativeComponent) am.getComponent(DeliberativeComponent.NAME);
                 
                 Iterator<Ritual> it = _ritualOptions.values().iterator();
@@ -289 +289 @@
                 {
                         r = it.next();
-                        if(dp.containsIntention(r))
+                        if(dc.containsIntention(r))
                         {
                                 it.remove();
@@ -301 +301 @@
         private float culturalEU(AgentModel am, ActivePursuitGoal g, float probability)
         {
-                DeliberativeProcess dp = (DeliberativeProcess) am.getComponent(DeliberativeProcess.NAME);
-                
-                IUtilityStrategy str =  dp.getUtilityStrategy();
+                DeliberativeComponent dc = (DeliberativeComponent) am.getComponent(DeliberativeComponent.NAME);
+                
+                IUtilityStrategy str =  dc.getUtilityStrategy();
                 
                 float contributionToSelf = str.getUtility(am, g);
                 
-                IGetUtilityForOthers ostrat = dp.getUtilityForOthersStrategy();
+                IGetUtilityForOthers ostrat = dc.getUtilityForOthersStrategy();
                 
                 float contributionOthers = ostrat.getUtilityForOthers(am, g);
@@ -323 +323 @@
         @Override
         public float getExpectedUtility(AgentModel am, ActivePursuitGoal g) {
-                DeliberativeProcess dp = (DeliberativeProcess) am.getComponent(DeliberativeProcess.NAME);
-                
-                float probability = dp.getProbabilityStrategy().getProbability(am, g);
+                DeliberativeComponent dc = (DeliberativeComponent) am.getComponent(DeliberativeComponent.NAME);
+                
+                float probability = dc.getProbabilityStrategy().getProbability(am, g);
                 return culturalEU(am,g,probability);
         }
@@ -332 +332 @@
         public float getExpectedUtility(AgentModel am, Intention i) {
                 
-                DeliberativeProcess dp = (DeliberativeProcess) am.getComponent(DeliberativeProcess.NAME); 
+                DeliberativeComponent dp = (DeliberativeComponent) am.getComponent(DeliberativeComponent.NAME); 
                 
                 float probability = dp.getProbabilityStrategy().getProbability(am, i);

AgentMind/branches/FAtiMA-Modular/FAtiMA.culture/src/FAtiMA/culture/CultureLoaderHandler.java

@@ -42 +42 @@
 import FAtiMA.Core.conditions.PropertyCondition;
 import FAtiMA.Core.conditions.RecentEventCondition;
-import FAtiMA.Core.deliberativeLayer.DeliberativeProcess;
-import FAtiMA.Core.deliberativeLayer.goals.Goal;
 import FAtiMA.Core.exceptions.ContextParsingException;
 import FAtiMA.Core.exceptions.DuplicateSymbolTranslatorEntry;
@@ -49 +47 @@
 import FAtiMA.Core.exceptions.InvalidEmotionTypeException;
 import FAtiMA.Core.exceptions.UnknownGoalException;
+import FAtiMA.Core.goals.Goal;
 import FAtiMA.Core.reactiveLayer.Reaction;
 import FAtiMA.Core.reactiveLayer.ReactiveProcess;
@@ -57 +56 @@
 import FAtiMA.Core.wellFormedNames.Substitution;
 import FAtiMA.Core.wellFormedNames.Symbol;
+import FAtiMA.DeliberativeComponent.DeliberativeComponent;
 
 
@@ -70 +70 @@
         
         ReactiveProcess _reactiveLayer;
-        DeliberativeProcess _deliberativeLayer;
+        DeliberativeComponent _deliberativeLayer;
         
 
@@ -80 +80 @@
                 _self = new Substitution(new Symbol("[SELF]"), new Symbol(FAtiMA.Core.util.Constants.SELF));
                 _reactiveLayer = (ReactiveProcess) aM.getComponent(ReactiveProcess.NAME); 
-                _deliberativeLayer = (DeliberativeProcess) aM.getComponent(DeliberativeProcess.NAME);
+                _deliberativeLayer = (DeliberativeComponent) aM.getComponent(DeliberativeComponent.NAME);
                 _am = aM;
                 _culturalComponent = cDM;

AgentMind/branches/FAtiMA-Modular/FAtiMA.culture/src/FAtiMA/culture/Ritual.java

@@ -38 +38 @@
 import FAtiMA.Core.AgentModel;
 import FAtiMA.Core.conditions.Condition;
-import FAtiMA.Core.deliberativeLayer.DeliberativeProcess;
-import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal;
-import FAtiMA.Core.deliberativeLayer.plan.CausalLink;
-import FAtiMA.Core.deliberativeLayer.plan.Effect;
-import FAtiMA.Core.deliberativeLayer.plan.IPlanningOperator;
-import FAtiMA.Core.deliberativeLayer.plan.OrderingConstraint;
-import FAtiMA.Core.deliberativeLayer.plan.Plan;
-import FAtiMA.Core.deliberativeLayer.plan.ProtectedCondition;
-import FAtiMA.Core.deliberativeLayer.plan.Step;
 import FAtiMA.Core.exceptions.InvalidReplaceUnboundVariableException;
+import FAtiMA.Core.goals.ActivePursuitGoal;
+import FAtiMA.Core.plans.CausalLink;
+import FAtiMA.Core.plans.Effect;
+import FAtiMA.Core.plans.IPlanningOperator;
+import FAtiMA.Core.plans.OrderingConstraint;
+import FAtiMA.Core.plans.Plan;
+import FAtiMA.Core.plans.ProtectedCondition;
+import FAtiMA.Core.plans.Step;
 import FAtiMA.Core.sensorEffector.Event;
 import FAtiMA.Core.wellFormedNames.Name;
@@ -164 +163 @@
         public void BuildPlan(AgentModel am)
         {
-                DeliberativeProcess dp = (DeliberativeProcess) am.getComponent(DeliberativeProcess.NAME);
                 
                 Step s;
                 OrderingConstraint o;
-                _plan = new Plan(new ArrayList<ProtectedCondition>(),dp.getDetectThreatStrategy(),_successConditions);
+                _plan = new Plan(new ArrayList<ProtectedCondition>(),_successConditions);
                 
                 for(int i=0; i < _steps.size(); i++)