Changeset 806


Ignore:
Timestamp:
01/11/2011 09:49:57 PM (10 years ago)
Author:
joao.dias
Message:
 
Location:
AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/AgentCore.java

    r802 r806  
    7272        protected ArrayList<IAdvancedPerceptionsComponent> _processPerceptionsComponents; 
    7373        protected ArrayList<IAffectDerivationComponent> _affectDerivationComponents; 
    74         protected ArrayList<IAppraisalComponent> _appraisalComponents; 
     74        protected ArrayList<IAppraisalDerivationComponent> _appraisalComponents; 
    7575         
    7676        protected EmotionalState _emotionalState; 
     
    126126                _processPerceptionsComponents = new ArrayList<IAdvancedPerceptionsComponent>(); 
    127127                _affectDerivationComponents = new ArrayList<IAffectDerivationComponent>(); 
    128                 _appraisalComponents = new ArrayList<IAppraisalComponent>(); 
     128                _appraisalComponents = new ArrayList<IAppraisalDerivationComponent>(); 
    129129                 
    130130                AgentSimulationTime.GetInstance(); //This call will initialize the timer for the agent's simulation time 
     
    306306                        _affectDerivationComponents.add((IAffectDerivationComponent) c); 
    307307                } 
    308                 if(c instanceof IAppraisalComponent) 
    309                 { 
    310                         _appraisalComponents.add((IAppraisalComponent) c); 
     308                if(c instanceof IAppraisalDerivationComponent) 
     309                { 
     310                        _appraisalComponents.add((IAppraisalDerivationComponent) c); 
    311311                } 
    312312                 
     
    458458                this._processPerceptionsComponents = (ArrayList<IAdvancedPerceptionsComponent>) s.readObject(); 
    459459                this._affectDerivationComponents = (ArrayList<IAffectDerivationComponent>) s.readObject(); 
    460                 this._appraisalComponents = (ArrayList<IAppraisalComponent>) s.readObject(); 
     460                this._appraisalComponents = (ArrayList<IAppraisalDerivationComponent>) s.readObject(); 
    461461                 
    462462                s.close(); 
     
    663663                                                         
    664664                                                        appraisal = new AppraisalFrame(this,e2); 
    665                                                         for(IAppraisalComponent c : this._appraisalComponents) 
     665                                                        for(IAppraisalDerivationComponent c : this._appraisalComponents) 
    666666                                                        { 
    667667                                                                c.appraisal(this,e2, appraisal); 
     
    671671                                        } 
    672672                                         
    673                                         for(IAppraisalComponent c : this._appraisalComponents) 
     673                                        for(IAppraisalDerivationComponent c : this._appraisalComponents) 
    674674                                        { 
    675675                                                c.reappraisal(this); 
     
    10041004                        this._processPerceptionsComponents = (ArrayList<IAdvancedPerceptionsComponent>) s.readObject(); 
    10051005                        this._affectDerivationComponents = (ArrayList<IAffectDerivationComponent>) s.readObject(); 
    1006                         this._appraisalComponents = (ArrayList<IAppraisalComponent>) s.readObject(); 
     1006                        this._appraisalComponents = (ArrayList<IAppraisalDerivationComponent>) s.readObject(); 
    10071007                         
    10081008                        AgentSimulationTime.LoadState(s); 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/IAppraisalDerivationComponent.java

    r803 r806  
    44import FAtiMA.Core.sensorEffector.Event; 
    55 
    6 public interface IAppraisalComponent extends IComponent { 
     6public interface IAppraisalDerivationComponent extends IComponent { 
    77         
    88        public void appraisal(AgentModel am, Event e, AppraisalFrame af); 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/DeliberativeProcess.java

    r802 r806  
    126126 
    127127import FAtiMA.Core.AgentModel; 
    128 import FAtiMA.Core.IAppraisalComponent; 
     128import FAtiMA.Core.IAppraisalDerivationComponent; 
    129129import FAtiMA.Core.IBehaviourComponent; 
    130130import FAtiMA.Core.IComponent; 
     
    161161 * @author João Dias 
    162162 */ 
    163 public class DeliberativeProcess implements Serializable, IComponent, IBehaviourComponent, IModelOfOtherComponent, IAppraisalComponent, IOptionsStrategy, IExpectedUtilityStrategy { 
     163public class DeliberativeProcess implements Serializable, IComponent, IBehaviourComponent, IModelOfOtherComponent, IAppraisalDerivationComponent, IOptionsStrategy, IExpectedUtilityStrategy { 
    164164         
    165165        /** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/reactiveLayer/ReactiveProcess.java

    r801 r806  
    6565 
    6666import FAtiMA.Core.AgentModel; 
    67 import FAtiMA.Core.IAppraisalComponent; 
     67import FAtiMA.Core.IAppraisalDerivationComponent; 
    6868import FAtiMA.Core.IBehaviourComponent; 
    6969import FAtiMA.Core.IComponent; 
     
    8080 * @author João Dias 
    8181 */ 
    82 public class ReactiveProcess implements Serializable, IComponent, IBehaviourComponent, IModelOfOtherComponent, IAppraisalComponent { 
     82public class ReactiveProcess implements Serializable, IComponent, IBehaviourComponent, IModelOfOtherComponent, IAppraisalDerivationComponent { 
    8383         
    8484    /** 
Note: See TracChangeset for help on using the changeset viewer.