Changeset 432


Ignore:
Timestamp:
09/10/2010 05:24:18 PM (10 years ago)
Author:
myl
Message:

Refactor the previous Generalise process to Commonalities because it is actually finding similarities between events returned by SA

Location:
AgentMind/trunk/AgentMind
Files:
3 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • AgentMind/trunk/AgentMind/AgentLauncher/src/AgentLauncher.java

    r399 r432  
    1717import MemoryProcesses.CompoundCue; 
    1818import MemoryProcesses.SpreadActivate; 
    19 import MemoryProcesses.Generalise; 
     19import MemoryProcesses.Commonalities; 
    2020 
    2121public class AgentLauncher { 
     
    9999                        agent.setSpreadActivate(new SpreadActivate()); 
    100100                        System.out.println("Spread activate set "); 
    101                         agent.setGeneralise(new Generalise()); 
    102                         System.out.println("Generalise set "); 
     101                        agent.setCommonalities(new Commonalities()); 
     102                        System.out.println("Commonalities set "); 
    103103                }                
    104104                agent.StartAgent(); 
  • AgentMind/trunk/AgentMind/FAtiMA/src/FAtiMA/Agent.java

    r426 r432  
    7171import FAtiMA.memory.ICompoundCue; 
    7272import FAtiMA.memory.ISpreadActivate; 
    73 import FAtiMA.memory.IGeneralise; 
     73import FAtiMA.memory.ICommonalities; 
    7474 
    7575public class Agent implements AgentModel { 
     
    107107        protected ICompoundCue _compoundCue; 
    108108        protected ISpreadActivate _spreadActivate; 
    109         protected IGeneralise _generalise; 
     109        protected ICommonalities _commonalities; 
    110110         
    111111        private String _saveDirectory; 
     
    390390         
    391391        /**  
    392          * Gets the generalise mechanism of the agent 
    393          * @return the generalise mechanism 
     392         * Gets the commonalities mechanism of the agent 
     393         * @return the commonalities mechanism 
    394394         *  added by Meiyii 18/03/10 
    395395         */      
    396         public IGeneralise getGeneralise() { 
    397                 return _generalise; 
     396        public ICommonalities getCommonalities() { 
     397                return _commonalities; 
    398398        } 
    399399         
     
    960960                 
    961961        /**  
    962          * Set the generalise mechanism object of the agent 
    963          * @param generalise 
     962         * Set the commonalities mechanism object of the agent 
     963         * @param commonalities 
    964964         *  added by Meiyii 18/03/10 
    965965         */      
    966         public void setGeneralise(IGeneralise generalise) { 
    967                 this._generalise = generalise; 
     966        public void setCommonalities(ICommonalities commonalities) { 
     967                this._commonalities = commonalities; 
    968968        } 
    969969         
  • AgentMind/trunk/AgentMind/FAtiMA/src/FAtiMA/sensorEffector/RemoteAgent.java

    r381 r432  
    346346                                } 
    347347                                 
    348                                 _agent.getGeneralise().GeneraliseEvents(_agent.getSpreadActivate().getDetails()); 
    349                                 Hashtable<ArrayList<Integer>, Hashtable<String, String>> gResult = _agent.getGeneralise().getMatch(); 
     348                                _agent.getCommonalities().eventCommonalities(_agent.getSpreadActivate().getDetails()); 
     349                                Hashtable<ArrayList<Integer>, Hashtable<String, String>> gResult = _agent.getCommonalities().getMatch(); 
    350350                         
    351351                                it = gResult.keySet().iterator(); 
  • AgentMind/trunk/AgentMind/MemoryProcesses/src/main/java/MemoryProcesses/CommonEvents.java

    r324 r432  
     1/**  
     2 * CommonEvents.java - A structure to hold events with the same matching values.  
     3 *     
     4 * This program is free software; you can redistribute it and/or modify 
     5 * it under the terms of the GNU General Public License as published by 
     6 * the Free Software Foundation; either version 2 of the License, or 
     7 * (at your option) any later version. 
     8 * 
     9 * This program is distributed in the hope that it will be useful, 
     10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     12 * GNU General Public License for more details. 
     13 * 
     14 * You should have received a copy of the GNU General Public License 
     15 * along with this program; if not, write to the Free Software 
     16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
     17 *  
     18 * Company: HWU 
     19 * Project: LIREC 
     20 * Created: 18/03/10 
     21 * @author: Meiyii Lim 
     22 * Email to: M.Lim@hw.ac.uk 
     23 *  
     24 * History:  
     25 * Meiyii Lim: 18/03/10 - File created 
     26 *  
     27 * **/ 
     28 
    129package MemoryProcesses; 
    230 
     
    533import java.util.Iterator; 
    634 
    7  
    8 import sun.security.x509.Extension; 
    935 
    1036import FAtiMA.memory.episodicMemory.ActionDetail; 
  • AgentMind/trunk/AgentMind/MemoryProcesses/src/main/java/MemoryProcesses/EventPair.java

    r324 r432  
     1/**  
     2 * EventPair.java - A temporary structure to hold two events for comparison.  
     3 *     
     4 * This program is free software; you can redistribute it and/or modify 
     5 * it under the terms of the GNU General Public License as published by 
     6 * the Free Software Foundation; either version 2 of the License, or 
     7 * (at your option) any later version. 
     8 * 
     9 * This program is distributed in the hope that it will be useful, 
     10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     12 * GNU General Public License for more details. 
     13 * 
     14 * You should have received a copy of the GNU General Public License 
     15 * along with this program; if not, write to the Free Software 
     16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
     17 *  
     18 * Company: HWU 
     19 * Project: LIREC 
     20 * Created: 18/03/10 
     21 * @author: Meiyii Lim 
     22 * Email to: M.Lim@hw.ac.uk 
     23 *  
     24 * History:  
     25 * Meiyii Lim: 18/03/10 - File created 
     26 *  
     27 * **/ 
     28 
    129package MemoryProcesses; 
    230 
  • AgentMind/trunk/AgentMind/WorldTest/src/UserInterface.java

    r392 r432  
    165165        else 
    166166        { 
     167                _userOptions.addItem("Judy"); 
     168                        _userOptions.addItem("David"); 
    167169                _userOptions.addItem(UserInterface.USER); 
    168170        } 
  • AgentMind/trunk/AgentMind/data/characters/minds/LIRECScenarios.xml

    r428 r432  
    9494                           goalsFile="LIRECGoalLibrary" cultureName="NoCulture"> 
    9595                        <Properties>                             
    96                                 <Property name="time" value="Morning"/> 
     96                                <Property name="time" value="Afternoon"/> 
    9797                                <Property name="isPerson" value="True"/> 
    9898                                <Property name="location" value="LivingRoom"/> 
Note: See TracChangeset for help on using the changeset viewer.