Changeset 971


Ignore:
Timestamp:
02/14/2011 12:25:55 AM (10 years ago)
Author:
joao.dias
Message:
 
Location:
AgentMind/branches/FAtiMA-Modular
Files:
1 added
1 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • AgentMind/branches/FAtiMA-Modular/AgentLauncher/.classpath

    r955 r971  
    99        <classpathentry combineaccessrules="false" kind="src" path="/FAtiMA.ToM"/> 
    1010        <classpathentry combineaccessrules="false" kind="src" path="/FAtiMA.DeliberativeComponent"/> 
     11        <classpathentry combineaccessrules="false" kind="src" path="/FAtiMA.ReactiveComponent"/> 
     12        <classpathentry combineaccessrules="false" kind="src" path="/FAtiMA.OCCAffectDerivation"/> 
    1113        <classpathentry kind="output" path="bin"/> 
    1214</classpath> 
  • AgentMind/branches/FAtiMA-Modular/AgentLauncher/src/AgentLauncher.java

    r931 r971  
    1111import FAtiMA.Core.exceptions.UnknownGoalException; 
    1212import FAtiMA.Core.util.ConfigurationManager; 
    13 import FAtiMA.ToM.ToMComponent; 
    14 import FAtiMA.culture.CulturalDimensionsComponent; 
    15 import FAtiMA.motivationalSystem.MotivationalComponent; 
    16 import FAtiMA.socialRelations.SocialRelationsComponent; 
     13import FAtiMA.DeliberativeComponent.DeliberativeComponent; 
     14import FAtiMA.OCCAffectDerivation.OCCAffectDerivationComponent; 
     15import FAtiMA.ReactiveComponent.ReactiveComponent; 
    1716 
    1817public class AgentLauncher { 
     
    3736                { 
    3837                        extraFiles.add(cultureFile); 
    39                         aG.addComponent(new SocialRelationsComponent(extraFiles)); 
    40                         aG.addComponent(new MotivationalComponent(extraFiles)); 
    41                         aG.addComponent(new ToMComponent(ConfigurationManager.getName())); 
    42                         aG.addComponent(new CulturalDimensionsComponent(cultureFile)); 
     38                         
     39                        aG.addComponent(new ReactiveComponent()); 
     40                        aG.addComponent(new OCCAffectDerivationComponent()); 
     41                        aG.addComponent(new DeliberativeComponent()); 
     42                        //aG.addComponent(new SocialRelationsComponent(extraFiles)); 
     43                        //aG.addComponent(new MotivationalComponent(extraFiles)); 
     44                        //aG.addComponent(new ToMComponent(ConfigurationManager.getName())); 
     45                        //aG.addComponent(new CulturalDimensionsComponent(cultureFile)); 
    4346                        //aG.addComponent(new AdvancedMemoryComponent()); 
    4447                } 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA.DeliberativeComponent/src/FAtiMA/DeliberativeComponent/DeliberativeComponent.java

    r966 r971  
    434434                                } 
    435435                                i.ProcessIntentionSuccess(am); 
     436                                return null; 
    436437                        } 
    437438                        else if(i.getGoal().CheckFailure(am)) 
     
    444445                                i.ProcessIntentionFailure(am); 
    445446                                cancelAction(am); 
     447                                return null; 
    446448                        } 
    447449                        else if(i.NumberOfAlternativePlans() == 0) 
     
    460462                                } 
    461463                                cancelAction(am); 
     464                                return null; 
    462465                        } 
    463466                        else if(!i.IsStrongCommitment() && !i.getGoal().checkPreconditions(am)) 
     
    476479                                i.ProcessIntentionCancel(am); 
    477480                                removeIntention(i); 
     481                                return null; 
    478482                        } 
    479483                         
  • AgentMind/branches/FAtiMA-Modular/FAtiMA.DeliberativeComponent/src/FAtiMA/DeliberativeComponent/EmotionalPlanner.java

    r970 r971  
    137137import FAtiMA.OCCAffectDerivation.OCCAppraisalVariables; 
    138138import FAtiMA.OCCAffectDerivation.OCCBaseEmotion; 
    139 import FAtiMA.OCCAffectDerivation.OCCComponent; 
     139import FAtiMA.OCCAffectDerivation.OCCAffectDerivationComponent; 
    140140import FAtiMA.OCCAffectDerivation.OCCEmotionType; 
    141141 
     
    441441                        auxFrame.SetAppraisalVariable(DeliberativeComponent.NAME, (short)6, OCCAppraisalVariables.FAILUREPROBABILITY.name(), prob); 
    442442                        auxFrame.SetAppraisalVariable(DeliberativeComponent.NAME, (short)6, OCCAppraisalVariables.GOALCONDUCIVENESS.name(), -tGoal.GetImportanceOfFailure(am)); 
    443                         auxFrame.SetAppraisalVariable(DeliberativeComponent.NAME, (short)6, OCCAppraisalVariables.GOALSTATUS.name(), OCCComponent.GOALUNCONFIRMED); 
     443                        auxFrame.SetAppraisalVariable(DeliberativeComponent.NAME, (short)6, OCCAppraisalVariables.GOALSTATUS.name(), OCCAffectDerivationComponent.GOALUNCONFIRMED); 
    444444                        am.updateEmotions(auxFrame); 
    445445                          
  • AgentMind/branches/FAtiMA-Modular/FAtiMA.DeliberativeComponent/src/FAtiMA/DeliberativeComponent/Intention.java

    r970 r971  
    4949import FAtiMA.Core.util.AgentLogger; 
    5050import FAtiMA.OCCAffectDerivation.OCCAppraisalVariables; 
    51 import FAtiMA.OCCAffectDerivation.OCCComponent; 
     51import FAtiMA.OCCAffectDerivation.OCCAffectDerivationComponent; 
    5252 
    5353 
     
    9090                _strongCommitment = false; 
    9191                _appraisalFrame = new AppraisalFrame(g.GetActivationEvent()); 
    92                 _appraisalFrame.SetAppraisalVariable(DeliberativeComponent.NAME, (short) 7, OCCAppraisalVariables.GOALSTATUS.name(), OCCComponent.GOALUNCONFIRMED); 
     92                _appraisalFrame.SetAppraisalVariable(DeliberativeComponent.NAME, (short) 7, OCCAppraisalVariables.GOALSTATUS.name(), OCCAffectDerivationComponent.GOALUNCONFIRMED); 
    9393        } 
    9494         
     
    385385            _appraisalFrame.SetAppraisalVariable(DeliberativeComponent.NAME, (short)7, OCCAppraisalVariables.FAILUREPROBABILITY.name(), 1-probability); 
    386386            _appraisalFrame.SetAppraisalVariable(DeliberativeComponent.NAME, (short)7, OCCAppraisalVariables.GOALCONDUCIVENESS.name(), goalConduciveness); 
    387             _appraisalFrame.SetAppraisalVariable(DeliberativeComponent.NAME, (short)7, OCCAppraisalVariables.GOALSTATUS.name(), OCCComponent.GOALUNCONFIRMED); 
     387            _appraisalFrame.SetAppraisalVariable(DeliberativeComponent.NAME, (short)7, OCCAppraisalVariables.GOALSTATUS.name(), OCCAffectDerivationComponent.GOALUNCONFIRMED); 
    388388             
    389389            am.updateEmotions(_appraisalFrame); 
     
    407407             
    408408            AppraisalFrame af = new AppraisalFrame(e); 
    409             af.SetAppraisalVariable(DeliberativeComponent.NAME,(short)8,OCCAppraisalVariables.GOALSTATUS.name(), OCCComponent.GOALDISCONFIRMED); 
     409            af.SetAppraisalVariable(DeliberativeComponent.NAME,(short)8,OCCAppraisalVariables.GOALSTATUS.name(), OCCAffectDerivationComponent.GOALDISCONFIRMED); 
    410410            af.SetAppraisalVariable(DeliberativeComponent.NAME, (short)8,OCCAppraisalVariables.GOALCONDUCIVENESS.name(), dp.getUtilityStrategy().getUtility(am, _goal)); 
    411411            am.updateEmotions(af); 
     
    445445            am.getMemory().getEpisodicMemory().StoreAction(am.getMemory(), e); 
    446446            AppraisalFrame af = new AppraisalFrame(e); 
    447             af.SetAppraisalVariable(DeliberativeComponent.NAME,(short)8,OCCAppraisalVariables.GOALSTATUS.name(), OCCComponent.GOALCONFIRMED); 
     447            af.SetAppraisalVariable(DeliberativeComponent.NAME,(short)8,OCCAppraisalVariables.GOALSTATUS.name(), OCCAffectDerivationComponent.GOALCONFIRMED); 
    448448            af.SetAppraisalVariable(DeliberativeComponent.NAME, (short)8,OCCAppraisalVariables.GOALCONDUCIVENESS.name(), dp.getUtilityStrategy().getUtility(am, _goal)); 
    449449            am.updateEmotions(af); 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA.ReactiveComponent/src/FAtiMA/ReactiveComponent/parsers/ReactiveLoaderHandler.java

    r965 r971  
    11package FAtiMA.ReactiveComponent.parsers; 
     2 
     3import java.util.Locale; 
    24 
    35import org.xml.sax.Attributes; 
     
    6567                emotionName = "fears_confirmed"; 
    6668                } 
     69         
     70        emotionName = emotionName.toUpperCase(Locale.ENGLISH); 
    6771         
    6872        minIntensity = new Integer(attributes.getValue("minIntensity")); 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/EmotionCondition.java

    r896 r971  
    3333import java.util.ArrayList; 
    3434import java.util.Iterator; 
     35import java.util.Locale; 
    3536 
    3637import org.xml.sax.Attributes; 
     
    7879                else active = true; 
    7980 
    80                 emotionType = attributes.getValue("emotion"); 
     81                emotionType = attributes.getValue("emotion").toUpperCase(Locale.ENGLISH); 
    8182                 
    8283                aux = attributes.getValue("agent"); 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/parsers/EmotionDispositionsLoaderHandler.java

    r962 r971  
    5050package FAtiMA.Core.util.parsers; 
    5151 
     52import java.util.Locale; 
     53 
    5254import org.xml.sax.Attributes; 
    5355 
     
    6971        String emotionName; 
    7072  
    71         emotionName = attributes.getValue("emotion"); 
     73        emotionName = attributes.getValue("emotion").toUpperCase(Locale.ENGLISH); 
    7274   
    7375        _emotionalState.AddEmotionDisposition(new EmotionDisposition(emotionName, 
  • AgentMind/branches/FAtiMA-Modular/WorldTest/src/RemoteAgent.java

    r960 r971  
    3131public class RemoteAgent extends SocketListener { 
    3232 
    33         final static int MIN_ACTION_DELAY_MS = 10000; 
    34         final static int MAX_ACTION_DELAY_MS = 10000; 
     33        final static int MIN_ACTION_DELAY_MS = 1000; 
     34        final static int MAX_ACTION_DELAY_MS = 3000; 
    3535        protected Random _generator;  
    3636        private ArrayList<Property> _properties; 
Note: See TracChangeset for help on using the changeset viewer.