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

Timestamp:

02/12/2011 05:24:08 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) (4 diffs)
• Ritual.java (modified) (3 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;
@@ -57 +58 @@
         @Override
         public void initialize(AgentModel aM){
+                DeliberativeProcess dp = (DeliberativeProcess) aM.getComponent(DeliberativeProcess.NAME);
                 this.loadCulture(aM);
-                aM.getDeliberativeLayer().AddOptionsStrategy(this);
-                aM.getDeliberativeLayer().setExpectedUtilityStrategy(this);
+                dp.addOptionsStrategy(this);
+                dp.setExpectedUtilityStrategy(this);
                 aM.getRemoteAgent().setProcessActionStrategy(new CultureProcessActionStrategy());
         }
@@ -111 +113 @@
                 Ritual r2, r3;
                 String ritualName;
+                DeliberativeProcess dp = (DeliberativeProcess) am.getComponent(DeliberativeProcess.NAME);
                 
                 //this section detects if a ritual has started with another agent's action
@@ -138 +141 @@
                                                                 ritualName = r3.getNameWithCharactersOrdered();
                                                                 r3.setUrgency(2);
-                                                                if(!_ritualOptions.containsKey(ritualName) && !am.getDeliberativeLayer().ContainsIntention(r3))
+                                                                if(!_ritualOptions.containsKey(ritualName) && !dp.containsIntention(r3))
                                                                 {
                                                                         AgentLogger.GetInstance().logAndPrint("Reactive Activation of a Ritual:" + r3.getName());
@@ -159 +162 @@
         
         private void loadCulture(AgentModel aM){
+                
+                DeliberativeProcess dp = (DeliberativeProcess) aM.getComponent(DeliberativeProcess.NAME);
 
                 AgentLogger.GetInstance().log("LOADING Culture: " + this.cultureFile);
@@ -171 +176 @@
                         for(Ritual r : cultureLoader.GetRituals(aM)){
                                 this._rituals.add(r);
-                                aM.getDeliberativeLayer().AddGoal(r);
+                                dp.addGoal(r);
                         }
 
@@ -276 +281 @@
         public Collection<? extends ActivePursuitGoal> options(AgentModel am) {
                 
+                DeliberativeProcess dp = (DeliberativeProcess) am.getComponent(DeliberativeProcess.NAME);
+                
                 Iterator<Ritual> it = _ritualOptions.values().iterator();
                 Ritual r;
@@ -282 +289 @@
                 {
                         r = it.next();
-                        if(am.getDeliberativeLayer().ContainsIntention(r))
+                        if(dp.containsIntention(r))
                         {
                                 it.remove();
@@ -294 +301 @@
         private float culturalEU(AgentModel am, ActivePursuitGoal g, float probability)
         {
-                IUtilityStrategy str =  am.getDeliberativeLayer().getUtilityStrategy();
+                DeliberativeProcess dp = (DeliberativeProcess) am.getComponent(DeliberativeProcess.NAME);
+                
+                IUtilityStrategy str =  dp.getUtilityStrategy();
                 
                 float contributionToSelf = str.getUtility(am, g);
                 
-                IGetUtilityForOthers ostrat = am.getDeliberativeLayer().getUtilityForOthersStrategy();
+                IGetUtilityForOthers ostrat = dp.getUtilityForOthersStrategy();
                 
                 float contributionOthers = ostrat.getUtilityForOthers(am, g);
@@ -314 +323 @@
         @Override
         public float getExpectedUtility(AgentModel am, ActivePursuitGoal g) {
-                
-                float probability = am.getDeliberativeLayer().getProbabilityStrategy().getProbability(am, g);
+                DeliberativeProcess dp = (DeliberativeProcess) am.getComponent(DeliberativeProcess.NAME);
+                
+                float probability = dp.getProbabilityStrategy().getProbability(am, g);
                 return culturalEU(am,g,probability);
         }
@@ -322 +332 @@
         public float getExpectedUtility(AgentModel am, Intention i) {
                 
-                float probability = am.getDeliberativeLayer().getProbabilityStrategy().getProbability(am, i);
+                DeliberativeProcess dp = (DeliberativeProcess) am.getComponent(DeliberativeProcess.NAME); 
+                
+                float probability = dp.getProbabilityStrategy().getProbability(am, i);
                 
                 return culturalEU(am,i.getGoal(),probability);

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

@@ -79 +79 @@
                 _rituals = new ArrayList<Ritual>();
                 _self = new Substitution(new Symbol("[SELF]"), new Symbol(FAtiMA.Core.util.Constants.SELF));
-                _reactiveLayer = aM.getReactiveLayer(); 
-                _deliberativeLayer = aM.getDeliberativeLayer();
+                _reactiveLayer = (ReactiveProcess) aM.getComponent(ReactiveProcess.NAME); 
+                _deliberativeLayer = (DeliberativeProcess) aM.getComponent(DeliberativeProcess.NAME);
                 _am = aM;
                 _culturalComponent = cDM;
@@ -172 +172 @@
                 if(_beforeRituals){
                         String goalName = attributes.getValue("name");  
-                    _deliberativeLayer.AddGoal(_am, goalName);  
+                        _deliberativeLayer.addGoal(_am, goalName);  
                 }
     }
@@ -216 +216 @@
                 stepName = Name.ParseName(attributes.getValue("name"));
                 role = new Symbol(attributes.getValue("role"));
-                _ritual.AddStep(stepName, role);
+                _ritual.AddStep(_am, stepName, role);
         }
 
@@ -266 +266 @@
                         _ritual.AddCondition(_conditionType, cond);
                 }else if (_currentGoalKey != null){
-                        Goal g = _deliberativeLayer.getGoalLibrary().GetGoal(Name.ParseName(_currentGoalKey));
+                        Goal g = _am.getGoalLibrary().GetGoal(Name.ParseName(_currentGoalKey));
                         g.AddCondition(_conditionType, cond);
                 }

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

@@ -36 +36 @@
 import java.util.ListIterator;
 
-import FAtiMA.Core.ActionLibrary;
 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;
@@ -84 +84 @@
         }
         
-        public void AddStep(Name actionName, Name role)
+        public void AddStep(AgentModel am, Name actionName, Name role)
         {
                 ArrayList<Substitution> subst;
-                Step action = ActionLibrary.GetInstance().GetAction(_steps.size(), actionName);
+                Step action =  am.getActionLibrary().getAction(_steps.size(), actionName);
                 if(action != null)
                 {
@@ -164 +164 @@
         public void BuildPlan(AgentModel am)
         {
+                DeliberativeProcess dp = (DeliberativeProcess) am.getComponent(DeliberativeProcess.NAME);
+                
                 Step s;
                 OrderingConstraint o;
-                _plan = new Plan(new ArrayList<ProtectedCondition>(),am.getDeliberativeLayer().getDetectThreatStrategy(),_successConditions);
+                _plan = new Plan(new ArrayList<ProtectedCondition>(),dp.getDetectThreatStrategy(),_successConditions);
                 
                 for(int i=0; i < _steps.size(); i++)