Changeset 667


Ignore:
Timestamp:
11/09/2010 01:37:59 PM (10 years ago)
Author:
joao.dias
Message:

Restruturação dos Packages

Location:
AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA
Files:
4 added
163 edited
52 moved

Legend:

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

    r660 r667  
    2828 * João Dias: 12/03/2008 - File created 
    2929 */ 
    30 package FAtiMA; 
     30package FAtiMA.Core; 
    3131 
    3232import java.io.File; 
     
    4242import javax.xml.parsers.SAXParserFactory; 
    4343 
    44 import FAtiMA.deliberativeLayer.plan.Step; 
    45 import FAtiMA.exceptions.ActionsParsingException; 
    46 import FAtiMA.util.AgentLogger; 
    47 import FAtiMA.util.parsers.ActionsLoaderHandler; 
    48 import FAtiMA.wellFormedNames.Name; 
    49 import FAtiMA.wellFormedNames.Substitution; 
    50 import FAtiMA.wellFormedNames.Unifier; 
     44import FAtiMA.Core.deliberativeLayer.plan.Step; 
     45import FAtiMA.Core.exceptions.ActionsParsingException; 
     46import FAtiMA.Core.util.AgentLogger; 
     47import FAtiMA.Core.util.parsers.ActionsLoaderHandler; 
     48import FAtiMA.Core.wellFormedNames.Name; 
     49import FAtiMA.Core.wellFormedNames.Substitution; 
     50import FAtiMA.Core.wellFormedNames.Unifier; 
    5151 
    5252/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/AgentCore.java

    r662 r667  
    1 package FAtiMA; 
     1package FAtiMA.Core; 
    22 
    33import java.io.File; 
     
    2727import org.xml.sax.SAXException; 
    2828 
    29 import FAtiMA.Display.AgentDisplay; 
    30 import FAtiMA.Display.AgentDisplayPanel; 
     29import FAtiMA.Core.Display.AgentDisplay; 
     30import FAtiMA.Core.Display.AgentDisplayPanel; 
     31import FAtiMA.Core.deliberativeLayer.DeliberativeProcess; 
     32import FAtiMA.Core.deliberativeLayer.EmotionalPlanner; 
     33import FAtiMA.Core.deliberativeLayer.goals.GoalLibrary; 
     34import FAtiMA.Core.deliberativeLayer.plan.Step; 
     35import FAtiMA.Core.emotionalState.ActiveEmotion; 
     36import FAtiMA.Core.emotionalState.Appraisal; 
     37import FAtiMA.Core.emotionalState.AppraisalStructure; 
     38import FAtiMA.Core.emotionalState.BaseEmotion; 
     39import FAtiMA.Core.emotionalState.EmotionalState; 
     40import FAtiMA.Core.exceptions.ActionsParsingException; 
     41import FAtiMA.Core.exceptions.GoalLibParsingException; 
     42import FAtiMA.Core.exceptions.UnknownGoalException; 
     43import FAtiMA.Core.memory.ICommonalities; 
     44import FAtiMA.Core.memory.ICompoundCue; 
     45import FAtiMA.Core.memory.ISpreadActivate; 
     46import FAtiMA.Core.memory.Memory; 
     47import FAtiMA.Core.memory.semanticMemory.KnowledgeSlot; 
     48import FAtiMA.Core.reactiveLayer.Action; 
     49import FAtiMA.Core.reactiveLayer.ActionTendencies; 
     50import FAtiMA.Core.reactiveLayer.EmotionalReactionTreeNode; 
     51import FAtiMA.Core.reactiveLayer.Reaction; 
     52import FAtiMA.Core.reactiveLayer.ReactiveProcess; 
     53import FAtiMA.Core.sensorEffector.Event; 
     54import FAtiMA.Core.sensorEffector.IONRemoteAgent; 
     55import FAtiMA.Core.sensorEffector.Parameter; 
     56import FAtiMA.Core.sensorEffector.RemoteAgent; 
     57import FAtiMA.Core.sensorEffector.SpeechAct; 
     58import FAtiMA.Core.sensorEffector.WorldSimulatorRemoteAgent; 
     59import FAtiMA.Core.util.AgentLogger; 
     60import FAtiMA.Core.util.ConfigurationManager; 
     61import FAtiMA.Core.util.Constants; 
     62import FAtiMA.Core.util.VersionChecker; 
     63import FAtiMA.Core.util.enumerables.ActionEvent; 
     64import FAtiMA.Core.util.enumerables.AgentPlatform; 
     65import FAtiMA.Core.util.enumerables.EmotionType; 
     66import FAtiMA.Core.util.enumerables.EventType; 
     67import FAtiMA.Core.util.parsers.AgentLoaderHandler; 
     68import FAtiMA.Core.util.parsers.BinaryStringConverter; 
     69import FAtiMA.Core.wellFormedNames.Name; 
     70import FAtiMA.Core.wellFormedNames.Symbol; 
    3171import FAtiMA.ToM.ModelOfOther; 
    3272import FAtiMA.culture.Ritual; 
    33 import FAtiMA.deliberativeLayer.DeliberativeProcess; 
    34 import FAtiMA.deliberativeLayer.EmotionalPlanner; 
    35 import FAtiMA.deliberativeLayer.goals.GoalLibrary; 
    36 import FAtiMA.deliberativeLayer.plan.Step; 
    3773import FAtiMA.emotionalIntelligence.ActionTendencyOperatorFactory; 
    3874import FAtiMA.emotionalIntelligence.OCCAppraisalRules; 
    39 import FAtiMA.emotionalState.ActiveEmotion; 
    40 import FAtiMA.emotionalState.Appraisal; 
    41 import FAtiMA.emotionalState.AppraisalStructure; 
    42 import FAtiMA.emotionalState.BaseEmotion; 
    43 import FAtiMA.emotionalState.EmotionalState; 
    44 import FAtiMA.exceptions.ActionsParsingException; 
    45 import FAtiMA.exceptions.GoalLibParsingException; 
    46 import FAtiMA.exceptions.UnknownGoalException; 
    47 import FAtiMA.memory.Memory; 
    48 import FAtiMA.memory.semanticMemory.KnowledgeSlot; 
    4975import FAtiMA.motivationalSystem.MotivationalState; 
    50 import FAtiMA.reactiveLayer.Action; 
    51 import FAtiMA.reactiveLayer.ActionTendencies; 
    52 import FAtiMA.reactiveLayer.EmotionalReactionTreeNode; 
    53 import FAtiMA.reactiveLayer.Reaction; 
    54 import FAtiMA.reactiveLayer.ReactiveProcess; 
    55 import FAtiMA.sensorEffector.Event; 
    56 import FAtiMA.sensorEffector.IONRemoteAgent; 
    57 import FAtiMA.sensorEffector.Parameter; 
    58 import FAtiMA.sensorEffector.RemoteAgent; 
    59 import FAtiMA.sensorEffector.SpeechAct; 
    60 import FAtiMA.sensorEffector.WorldSimulatorRemoteAgent; 
    6176import FAtiMA.socialRelations.LikeRelation; 
    62 import FAtiMA.util.AgentLogger; 
    63 import FAtiMA.util.Constants; 
    64 import FAtiMA.util.ConfigurationManager; 
    65 import FAtiMA.util.VersionChecker; 
    66 import FAtiMA.util.enumerables.ActionEvent; 
    67 import FAtiMA.util.enumerables.AgentPlatform; 
    68 import FAtiMA.util.enumerables.EmotionType; 
    69 import FAtiMA.util.enumerables.EventType; 
    70 import FAtiMA.util.parsers.AgentLoaderHandler; 
    71 import FAtiMA.util.parsers.BinaryStringConverter; 
    72 import FAtiMA.wellFormedNames.Name; 
    73 import FAtiMA.wellFormedNames.Symbol; 
    74  
    75 import FAtiMA.memory.ICompoundCue; 
    76 import FAtiMA.memory.ISpreadActivate; 
    77 import FAtiMA.memory.ICommonalities; 
     77 
    7878 
    7979public class AgentCore implements AgentModel, IGetModelStrategy { 
     
    181181        } 
    182182 
    183  
    184  
    185  
    186  
     183         
     184         
    187185        public AgentCore(short agentPlatform, String host, int port, String directory, String fileName) 
    188186        { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/AgentModel.java

    r660 r667  
    1 package FAtiMA; 
     1package FAtiMA.Core; 
    22 
    33import java.util.Collection; 
    44import java.util.HashMap; 
    55 
    6 import FAtiMA.Display.AgentDisplay; 
    7 import FAtiMA.deliberativeLayer.DeliberativeProcess; 
    8 import FAtiMA.emotionalState.EmotionalState; 
    9 import FAtiMA.memory.ICompoundCue; 
    10 import FAtiMA.memory.ISpreadActivate; 
    11 import FAtiMA.memory.Memory; 
     6import FAtiMA.Core.Display.AgentDisplay; 
     7import FAtiMA.Core.deliberativeLayer.DeliberativeProcess; 
     8import FAtiMA.Core.emotionalState.EmotionalState; 
     9import FAtiMA.Core.memory.ICompoundCue; 
     10import FAtiMA.Core.memory.ISpreadActivate; 
     11import FAtiMA.Core.memory.Memory; 
     12import FAtiMA.Core.reactiveLayer.ActionTendencies; 
     13import FAtiMA.Core.reactiveLayer.EmotionalReactionTreeNode; 
     14import FAtiMA.Core.reactiveLayer.ReactiveProcess; 
     15import FAtiMA.Core.sensorEffector.Event; 
     16import FAtiMA.Core.wellFormedNames.Symbol; 
    1217import FAtiMA.motivationalSystem.MotivationalState; 
    13 import FAtiMA.reactiveLayer.ActionTendencies; 
    14 import FAtiMA.reactiveLayer.EmotionalReactionTreeNode; 
    15 import FAtiMA.reactiveLayer.ReactiveProcess; 
    16 import FAtiMA.sensorEffector.Event; 
    17 import FAtiMA.wellFormedNames.Symbol; 
    1818 
    1919public interface AgentModel { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/AgentProcess.java

    r660 r667  
    3737 */ 
    3838 
    39 package FAtiMA; 
     39package FAtiMA.Core; 
    4040 
    4141import java.io.Serializable; 
    4242import java.util.ArrayList; 
    4343 
    44 import FAtiMA.emotionalState.EmotionalState; 
    45 import FAtiMA.sensorEffector.Event; 
     44import FAtiMA.Core.emotionalState.EmotionalState; 
     45import FAtiMA.Core.sensorEffector.Event; 
    4646 
    4747 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/AgentSimulationTime.java

    r660 r667  
    3232 * João Dias: 29/08/2006 - Solved small bug in LoadState method 
    3333 */ 
    34 package FAtiMA; 
     34package FAtiMA.Core; 
    3535 
    3636import java.io.FileInputStream; 
     
    4040import java.io.Serializable; 
    4141 
    42 import FAtiMA.util.AgentLogger; 
     42import FAtiMA.Core.util.AgentLogger; 
    4343 
    4444/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/DialogManager.java

    r660 r667  
    3131 */ 
    3232 
    33 package FAtiMA; 
     33package FAtiMA.Core; 
    3434 
    3535import java.io.Serializable; 
    3636 
    37 import FAtiMA.memory.Memory; 
    38 import FAtiMA.sensorEffector.Event; 
    39 import FAtiMA.sensorEffector.SpeechAct; 
    40 import FAtiMA.wellFormedNames.Name; 
     37import FAtiMA.Core.memory.Memory; 
     38import FAtiMA.Core.sensorEffector.Event; 
     39import FAtiMA.Core.sensorEffector.SpeechAct; 
     40import FAtiMA.Core.wellFormedNames.Name; 
    4141 
    4242 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/ActionDisplay.java

    r630 r667  
    1 package FAtiMA.Display ; 
     1package FAtiMA.Core.Display ; 
    22 
    33import java.awt.Dimension; 
     
    88import javax.swing.JPanel; 
    99 
    10 import FAtiMA.reactiveLayer.Action; 
    11 import FAtiMA.util.enumerables.EmotionType; 
     10import FAtiMA.Core.reactiveLayer.Action; 
     11import FAtiMA.Core.util.enumerables.EmotionType; 
    1212 
    1313public class ActionDisplay extends JPanel { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/ActionTendenciesPanel.java

    r651 r667  
    1 package FAtiMA.Display; 
     1package FAtiMA.Core.Display; 
    22 
    33import javax.swing.BorderFactory; 
     
    66import javax.swing.JScrollPane; 
    77 
    8 import FAtiMA.AgentCore; 
    9 import FAtiMA.AgentModel; 
    10 import FAtiMA.reactiveLayer.Action; 
    11 import FAtiMA.reactiveLayer.ActionTendencies; 
     8import FAtiMA.Core.AgentCore; 
     9import FAtiMA.Core.AgentModel; 
     10import FAtiMA.Core.reactiveLayer.Action; 
     11import FAtiMA.Core.reactiveLayer.ActionTendencies; 
    1212 
    1313public class ActionTendenciesPanel extends AgentDisplayPanel { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/AgentDisplay.java

    r654 r667  
    3030 */ 
    3131 
    32 package FAtiMA.Display; 
     32package FAtiMA.Core.Display; 
    3333 
    3434import javax.swing.BoxLayout; 
     
    3838import javax.swing.JTabbedPane; 
    3939 
    40 import FAtiMA.AgentCore; 
     40import FAtiMA.Core.AgentCore; 
    4141 
    4242/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/AgentDisplayPanel.java

    r651 r667  
    2929 */ 
    3030 
    31 package FAtiMA.Display; 
     31package FAtiMA.Core.Display; 
    3232 
    3333import javax.swing.JPanel; 
    3434 
    35 import FAtiMA.AgentCore; 
    36 import FAtiMA.AgentModel; 
     35import FAtiMA.Core.AgentCore; 
     36import FAtiMA.Core.AgentModel; 
    3737 
    3838 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/ConditionsPanel.java

    r278 r667  
    2929 */ 
    3030 
    31 package FAtiMA.Display; 
     31package FAtiMA.Core.Display; 
    3232 
    3333import java.awt.Dimension; 
     
    4040import javax.swing.JScrollPane; 
    4141 
    42 import FAtiMA.conditions.Condition; 
     42import FAtiMA.Core.conditions.Condition; 
    4343 
    4444 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/EmotionDisplay.java

    r278 r667  
    2828 * João Dias: 26/10/2005 - File created 
    2929 */ 
    30 package FAtiMA.Display; 
     30package FAtiMA.Core.Display; 
    3131 
    3232import java.awt.Color; 
     
    3737import javax.swing.JProgressBar; 
    3838 
    39 import FAtiMA.emotionalState.ActiveEmotion; 
    40 import FAtiMA.util.enumerables.EmotionType; 
     39import FAtiMA.Core.emotionalState.ActiveEmotion; 
     40import FAtiMA.Core.util.enumerables.EmotionType; 
    4141 
    4242 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/EmotionalStatePanel.java

    r651 r667  
    2929 */ 
    3030 
    31 package FAtiMA.Display; 
     31package FAtiMA.Core.Display; 
    3232 
    3333import java.awt.Color; 
     
    4242import javax.swing.JScrollPane; 
    4343 
    44 import FAtiMA.AgentCore; 
    45 import FAtiMA.AgentModel; 
    46 import FAtiMA.emotionalState.ActiveEmotion; 
    47 import FAtiMA.emotionalState.EmotionalState; 
     44import FAtiMA.Core.AgentCore; 
     45import FAtiMA.Core.AgentModel; 
     46import FAtiMA.Core.emotionalState.ActiveEmotion; 
     47import FAtiMA.Core.emotionalState.EmotionalState; 
    4848 
    4949 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/EpisodicMemoryPanel.java

    r651 r667  
    2828 * **/ 
    2929 
    30 package FAtiMA.Display; 
     30package FAtiMA.Core.Display; 
    3131 
    3232import java.awt.Dimension; 
     
    4040import javax.swing.JScrollPane; 
    4141 
    42 import FAtiMA.AgentCore; 
    43 import FAtiMA.AgentModel; 
    44 import FAtiMA.memory.episodicMemory.MemoryEpisode; 
     42import FAtiMA.Core.AgentCore; 
     43import FAtiMA.Core.AgentModel; 
     44import FAtiMA.Core.memory.episodicMemory.MemoryEpisode; 
    4545 
    4646 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/GERDisplay.java

    r444 r667  
    1 package FAtiMA.Display; 
     1package FAtiMA.Core.Display; 
    22 
    33import java.awt.Color; 
     
    99import javax.swing.JTextField; 
    1010 
    11 import FAtiMA.memory.generalMemory.GER; 
     11import FAtiMA.Core.memory.generalMemory.GER; 
    1212 
    1313 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/GeneralMemoryPanel.java

    r651 r667  
    1 package FAtiMA.Display; 
     1package FAtiMA.Core.Display; 
    22 
    33import java.awt.Color; 
     
    1212import javax.swing.JScrollPane; 
    1313 
    14 import FAtiMA.AgentCore; 
    15 import FAtiMA.AgentModel; 
    16 import FAtiMA.memory.generalMemory.GER; 
     14import FAtiMA.Core.AgentCore; 
     15import FAtiMA.Core.AgentModel; 
     16import FAtiMA.Core.memory.generalMemory.GER; 
    1717 
    1818public class GeneralMemoryPanel extends AgentDisplayPanel { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/GoalDisplay.java

    r278 r667  
    2828 * João Dias: 26/10/2005 - File created 
    2929 */ 
    30 package FAtiMA.Display; 
     30package FAtiMA.Core.Display; 
    3131 
    3232import java.awt.Dimension; 
     
    3737import javax.swing.JPanel; 
    3838 
    39 import FAtiMA.AgentModel; 
    40 import FAtiMA.deliberativeLayer.goals.ActivePursuitGoal; 
    41 import FAtiMA.deliberativeLayer.goals.Goal; 
    42 import FAtiMA.deliberativeLayer.goals.InterestGoal; 
     39import FAtiMA.Core.AgentModel; 
     40import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; 
     41import FAtiMA.Core.deliberativeLayer.goals.Goal; 
     42import FAtiMA.Core.deliberativeLayer.goals.InterestGoal; 
    4343 
    4444 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/GoalsPanel.java

    r651 r667  
    2828 */ 
    2929 
    30 package FAtiMA.Display; 
     30package FAtiMA.Core.Display; 
    3131 
    3232import java.awt.Dimension; 
     
    4040import javax.swing.JScrollPane; 
    4141 
    42 import FAtiMA.AgentCore; 
    43 import FAtiMA.AgentModel; 
    44 import FAtiMA.deliberativeLayer.DeliberativeProcess; 
    45 import FAtiMA.deliberativeLayer.Intention; 
    46 import FAtiMA.deliberativeLayer.goals.Goal; 
    47 import FAtiMA.wellFormedNames.Name; 
     42import FAtiMA.Core.AgentCore; 
     43import FAtiMA.Core.AgentModel; 
     44import FAtiMA.Core.deliberativeLayer.DeliberativeProcess; 
     45import FAtiMA.Core.deliberativeLayer.Intention; 
     46import FAtiMA.Core.deliberativeLayer.goals.Goal; 
     47import FAtiMA.Core.wellFormedNames.Name; 
    4848 
    4949 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/IntentionDisplay.java

    r278 r667  
    2929 */ 
    3030 
    31 package FAtiMA.Display; 
     31package FAtiMA.Core.Display; 
    3232 
    3333import java.awt.Dimension; 
     
    3838import javax.swing.JPanel; 
    3939 
    40 import FAtiMA.AgentModel; 
    41 import FAtiMA.deliberativeLayer.Intention; 
     40import FAtiMA.Core.AgentModel; 
     41import FAtiMA.Core.deliberativeLayer.Intention; 
    4242 
    4343 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/KnowledgeBasePanel.java

    r651 r667  
    2929 */ 
    3030 
    31 package FAtiMA.Display; 
     31package FAtiMA.Core.Display; 
    3232 
    3333import java.util.ArrayList; 
     
    3838import javax.swing.JScrollPane; 
    3939 
    40 import FAtiMA.AgentCore; 
    41 import FAtiMA.AgentModel; 
    42 import FAtiMA.memory.semanticMemory.KnowledgeSlot; 
     40import FAtiMA.Core.AgentCore; 
     41import FAtiMA.Core.AgentModel; 
     42import FAtiMA.Core.memory.semanticMemory.KnowledgeSlot; 
    4343 
    4444 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/KnowledgeFactDisplay.java

    r326 r667  
    2828 * João Dias: 26/10/2005 - File created 
    2929 */ 
    30 package FAtiMA.Display; 
     30package FAtiMA.Core.Display; 
    3131 
    3232import java.awt.Dimension; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/MemoryDetailPanel.java

    r435 r667  
    2828 * **/ 
    2929 
    30 package FAtiMA.Display; 
     30package FAtiMA.Core.Display; 
    3131 
    3232import java.awt.Color; 
     
    3838import javax.swing.JTextField; 
    3939 
    40 import FAtiMA.memory.episodicMemory.ActionDetail; 
    41 import FAtiMA.util.enumerables.EmotionType; 
     40import FAtiMA.Core.memory.episodicMemory.ActionDetail; 
     41import FAtiMA.Core.util.enumerables.EmotionType; 
    4242 
    4343 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/MemoryEpisodeDisplay.java

    r435 r667  
    2828 * **/ 
    2929 
    30 package FAtiMA.Display; 
     30package FAtiMA.Core.Display; 
    3131 
    3232import java.awt.Color; 
     
    4141import javax.swing.JTextArea; 
    4242 
    43 import FAtiMA.memory.episodicMemory.ActionDetail; 
    44 import FAtiMA.memory.episodicMemory.MemoryEpisode; 
     43import FAtiMA.Core.memory.episodicMemory.ActionDetail; 
     44import FAtiMA.Core.memory.episodicMemory.MemoryEpisode; 
    4545 
    4646 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/RecordDetailPanel.java

    r381 r667  
    1 package FAtiMA.Display; 
     1package FAtiMA.Core.Display; 
    22 
    33import java.awt.Color; 
     
    99import javax.swing.JTextField; 
    1010 
    11 import FAtiMA.memory.episodicMemory.ActionDetail; 
    12 import FAtiMA.util.enumerables.EmotionType; 
     11import FAtiMA.Core.memory.episodicMemory.ActionDetail; 
     12import FAtiMA.Core.util.enumerables.EmotionType; 
    1313 
    1414public class RecordDetailPanel extends JPanel { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/STMRecordDisplay.java

    r328 r667  
    2828 * **/ 
    2929 
    30 package FAtiMA.Display; 
     30package FAtiMA.Core.Display; 
    3131 
    3232import java.awt.Color; 
     
    4242import java.util.ArrayList; 
    4343 
    44 import FAtiMA.AgentModel; 
    45 import FAtiMA.memory.episodicMemory.ActionDetail; 
     44import FAtiMA.Core.AgentModel; 
     45import FAtiMA.Core.memory.episodicMemory.ActionDetail; 
    4646 
    4747public class STMRecordDisplay { 
     
    177177                ListIterator<ActionDetail> li = am.getMemory().getEpisodicMemory().getDetails().listIterator(); 
    178178         
    179                 ArrayList<FAtiMA.memory.episodicMemory.ActionDetail> newRecords = am.getMemory().getEpisodicMemory().GetNewRecords(); 
     179                ArrayList<FAtiMA.Core.memory.episodicMemory.ActionDetail> newRecords = am.getMemory().getEpisodicMemory().GetNewRecords(); 
    180180                 
    181181                while(li.hasNext()) 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/ShortTermMemoryPanel.java

    r651 r667  
    2828 * **/ 
    2929 
    30 package FAtiMA.Display; 
     30package FAtiMA.Core.Display; 
    3131 
    3232import java.awt.Color; 
     
    4040import javax.swing.JScrollPane; 
    4141 
    42 import FAtiMA.AgentCore; 
    43 import FAtiMA.AgentModel; 
    44 import FAtiMA.memory.semanticMemory.KnowledgeSlot; 
    45 import FAtiMA.memory.semanticMemory.SemanticMemory; 
    46 import FAtiMA.memory.semanticMemory.WorkingMemory; 
     42import FAtiMA.Core.AgentCore; 
     43import FAtiMA.Core.AgentModel; 
     44import FAtiMA.Core.memory.semanticMemory.KnowledgeSlot; 
     45import FAtiMA.Core.memory.semanticMemory.SemanticMemory; 
     46import FAtiMA.Core.memory.semanticMemory.WorkingMemory; 
    4747 
    4848public class ShortTermMemoryPanel extends AgentDisplayPanel { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/Display/TestAction.java

    r643 r667  
    1 package FAtiMA.Display; 
     1package FAtiMA.Core.Display; 
    22 
    33import java.awt.event.ActionEvent; 
    44import java.awt.event.ActionListener; 
    55 
    6 import FAtiMA.AgentCore; 
     6import FAtiMA.Core.AgentCore; 
    77 
    88public class TestAction implements ActionListener { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/IComponent.java

    r660 r667  
    1 package FAtiMA; 
     1package FAtiMA.Core; 
    22 
    33import java.io.IOException; 
     
    77import org.xml.sax.SAXException; 
    88 
    9 import FAtiMA.Display.AgentDisplayPanel; 
    10 import FAtiMA.emotionalState.ActiveEmotion; 
    11 import FAtiMA.emotionalState.AppraisalStructure; 
    12 import FAtiMA.sensorEffector.Event; 
    13 import FAtiMA.wellFormedNames.Name; 
     9import FAtiMA.Core.Display.AgentDisplayPanel; 
     10import FAtiMA.Core.emotionalState.ActiveEmotion; 
     11import FAtiMA.Core.emotionalState.AppraisalStructure; 
     12import FAtiMA.Core.sensorEffector.Event; 
     13import FAtiMA.Core.wellFormedNames.Name; 
    1414 
    1515public interface IComponent { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/IGetModelStrategy.java

    r660 r667  
    1 package FAtiMA; 
     1package FAtiMA.Core; 
    22 
    3 import FAtiMA.wellFormedNames.Symbol; 
     3import FAtiMA.Core.wellFormedNames.Symbol; 
    44 
    55public interface IGetModelStrategy { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/IIntegrityTester.java

    r660 r667  
    3131 */ 
    3232 
    33 package FAtiMA; 
     33package FAtiMA.Core; 
    3434 
    35 import FAtiMA.exceptions.UnknownSpeechActException; 
     35import FAtiMA.Core.exceptions.UnknownSpeechActException; 
    3636 
    3737/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/IntegrityValidator.java

    r660 r667  
    4343 */ 
    4444 
    45 package FAtiMA; 
     45package FAtiMA.Core; 
    4646 
    4747import java.util.ArrayList; 
    4848 
    4949 
    50 import FAtiMA.conditions.Condition; 
    51 import FAtiMA.exceptions.UnknownSpeechActException; 
    52 import FAtiMA.sensorEffector.SpeechAct; 
    53 import FAtiMA.wellFormedNames.Name; 
     50import FAtiMA.Core.conditions.Condition; 
     51import FAtiMA.Core.exceptions.UnknownSpeechActException; 
     52import FAtiMA.Core.sensorEffector.SpeechAct; 
     53import FAtiMA.Core.wellFormedNames.Name; 
    5454 
    5555/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/ValuedAction.java

    r660 r667  
    3737 */ 
    3838 
    39 package FAtiMA; 
     39package FAtiMA.Core; 
    4040 
    4141import java.io.Serializable; 
    4242 
    43 import FAtiMA.emotionalState.ActiveEmotion; 
    44 import FAtiMA.emotionalState.EmotionalState; 
    45 import FAtiMA.wellFormedNames.Name; 
     43import FAtiMA.Core.emotionalState.ActiveEmotion; 
     44import FAtiMA.Core.emotionalState.EmotionalState; 
     45import FAtiMA.Core.wellFormedNames.Name; 
    4646 
    4747 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/Condition.java

    r643 r667  
    5858 */ 
    5959 
    60 package FAtiMA.conditions; 
     60package FAtiMA.Core.conditions; 
    6161 
    6262import java.io.Serializable; 
     
    6464import java.util.ListIterator; 
    6565 
    66 import FAtiMA.AgentModel; 
    67 import FAtiMA.memory.semanticMemory.KnowledgeBase; 
    68 import FAtiMA.util.Constants; 
    69 import FAtiMA.wellFormedNames.IGroundable; 
    70 import FAtiMA.wellFormedNames.Name; 
    71 import FAtiMA.wellFormedNames.Substitution; 
    72 import FAtiMA.wellFormedNames.SubstitutionSet; 
    73 import FAtiMA.wellFormedNames.Symbol; 
     66import FAtiMA.Core.AgentModel; 
     67import FAtiMA.Core.memory.semanticMemory.KnowledgeBase; 
     68import FAtiMA.Core.util.Constants; 
     69import FAtiMA.Core.wellFormedNames.IGroundable; 
     70import FAtiMA.Core.wellFormedNames.Name; 
     71import FAtiMA.Core.wellFormedNames.Substitution; 
     72import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
     73import FAtiMA.Core.wellFormedNames.Symbol; 
    7474 
    7575 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/Context.java

    r643 r667  
    1 package FAtiMA.conditions; 
     1package FAtiMA.Core.conditions; 
    22 
    33import java.util.ArrayList; 
    44 
    5 import FAtiMA.AgentModel; 
     5import FAtiMA.Core.AgentModel; 
     6import FAtiMA.Core.wellFormedNames.Name; 
     7import FAtiMA.Core.wellFormedNames.Substitution; 
     8import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
    69import FAtiMA.socialRelations.LikeCondition; 
    7 import FAtiMA.wellFormedNames.Name; 
    8 import FAtiMA.wellFormedNames.Substitution; 
    9 import FAtiMA.wellFormedNames.SubstitutionSet; 
    1010 
    1111/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/EmotionCondition.java

    r643 r667  
    2828 */ 
    2929 
    30 package FAtiMA.conditions; 
     30package FAtiMA.Core.conditions; 
    3131 
    3232import java.text.DecimalFormat; 
     
    3636import org.xml.sax.Attributes; 
    3737 
    38 import FAtiMA.AgentModel; 
    39 import FAtiMA.emotionalState.ActiveEmotion; 
    40 import FAtiMA.emotionalState.EmotionalState; 
    41 import FAtiMA.exceptions.InvalidEmotionTypeException; 
    42 import FAtiMA.memory.semanticMemory.KnowledgeBase; 
    43 import FAtiMA.util.Constants; 
    44 import FAtiMA.util.enumerables.EmotionType; 
    45 import FAtiMA.wellFormedNames.Name; 
    46 import FAtiMA.wellFormedNames.Substitution; 
    47 import FAtiMA.wellFormedNames.SubstitutionSet; 
    48 import FAtiMA.wellFormedNames.Symbol; 
    49 import FAtiMA.wellFormedNames.Unifier; 
     38import FAtiMA.Core.AgentModel; 
     39import FAtiMA.Core.emotionalState.ActiveEmotion; 
     40import FAtiMA.Core.emotionalState.EmotionalState; 
     41import FAtiMA.Core.exceptions.InvalidEmotionTypeException; 
     42import FAtiMA.Core.memory.semanticMemory.KnowledgeBase; 
     43import FAtiMA.Core.util.Constants; 
     44import FAtiMA.Core.util.enumerables.EmotionType; 
     45import FAtiMA.Core.wellFormedNames.Name; 
     46import FAtiMA.Core.wellFormedNames.Substitution; 
     47import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
     48import FAtiMA.Core.wellFormedNames.Symbol; 
     49import FAtiMA.Core.wellFormedNames.Unifier; 
    5050 
    5151public class EmotionCondition extends PredicateCondition { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/EmotionalEpisodeCondition.java

    r629 r667  
    2828 */ 
    2929 
    30 package FAtiMA.conditions; 
     30package FAtiMA.Core.conditions; 
    3131 
    3232import java.util.ArrayList; 
     
    3434import org.xml.sax.Attributes; 
    3535 
    36 import FAtiMA.AgentModel; 
    37 import FAtiMA.emotionalState.BaseEmotion; 
    38 import FAtiMA.emotionalState.EmotionalState; 
    39 import FAtiMA.exceptions.InvalidEmotionTypeException; 
    40 import FAtiMA.memory.episodicMemory.MemoryEpisode; 
    41 import FAtiMA.util.Constants; 
    42 import FAtiMA.util.enumerables.EmotionType; 
    43 import FAtiMA.wellFormedNames.Name; 
    44 import FAtiMA.wellFormedNames.Substitution; 
    45 import FAtiMA.wellFormedNames.SubstitutionSet; 
    46 import FAtiMA.wellFormedNames.Symbol; 
     36import FAtiMA.Core.AgentModel; 
     37import FAtiMA.Core.emotionalState.BaseEmotion; 
     38import FAtiMA.Core.emotionalState.EmotionalState; 
     39import FAtiMA.Core.exceptions.InvalidEmotionTypeException; 
     40import FAtiMA.Core.memory.episodicMemory.MemoryEpisode; 
     41import FAtiMA.Core.util.Constants; 
     42import FAtiMA.Core.util.enumerables.EmotionType; 
     43import FAtiMA.Core.wellFormedNames.Name; 
     44import FAtiMA.Core.wellFormedNames.Substitution; 
     45import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
     46import FAtiMA.Core.wellFormedNames.Symbol; 
    4747 
    4848public class EmotionalEpisodeCondition extends Condition { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/MoodCondition.java

    r605 r667  
    2727 */ 
    2828 
    29 package FAtiMA.conditions; 
     29package FAtiMA.Core.conditions; 
    3030 
    3131import java.util.ArrayList; 
     
    3333import org.xml.sax.Attributes; 
    3434 
    35 import FAtiMA.AgentModel; 
    36 import FAtiMA.emotionalState.EmotionalState; 
    37 import FAtiMA.exceptions.InvalidMoodOperatorException; 
    38 import FAtiMA.exceptions.NoMoodOperatorDefinedException; 
    39 import FAtiMA.util.Constants; 
    40 import FAtiMA.wellFormedNames.Name; 
    41 import FAtiMA.wellFormedNames.Substitution; 
    42 import FAtiMA.wellFormedNames.SubstitutionSet; 
    43 import FAtiMA.wellFormedNames.Symbol; 
     35import FAtiMA.Core.AgentModel; 
     36import FAtiMA.Core.emotionalState.EmotionalState; 
     37import FAtiMA.Core.exceptions.InvalidMoodOperatorException; 
     38import FAtiMA.Core.exceptions.NoMoodOperatorDefinedException; 
     39import FAtiMA.Core.util.Constants; 
     40import FAtiMA.Core.wellFormedNames.Name; 
     41import FAtiMA.Core.wellFormedNames.Substitution; 
     42import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
     43import FAtiMA.Core.wellFormedNames.Symbol; 
    4444 
    4545 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/NewEventCondition.java

    r604 r667  
    1 package FAtiMA.conditions; 
     1package FAtiMA.Core.conditions; 
    22 
    33import java.util.ArrayList; 
    44import java.util.ListIterator; 
    55 
    6 import FAtiMA.AgentModel; 
    7 import FAtiMA.memory.episodicMemory.SearchKey; 
    8 import FAtiMA.util.Constants; 
    9 import FAtiMA.wellFormedNames.Name; 
    10 import FAtiMA.wellFormedNames.Symbol; 
     6import FAtiMA.Core.AgentModel; 
     7import FAtiMA.Core.memory.episodicMemory.SearchKey; 
     8import FAtiMA.Core.util.Constants; 
     9import FAtiMA.Core.wellFormedNames.Name; 
     10import FAtiMA.Core.wellFormedNames.Symbol; 
    1111 
    1212public class NewEventCondition extends RecentEventCondition { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/NullPlaceCondition.java

    r278 r667  
    1 package FAtiMA.conditions; 
     1package FAtiMA.Core.conditions; 
    22 
    33import java.util.ArrayList; 
    44 
    5 import FAtiMA.AgentModel; 
    6 import FAtiMA.wellFormedNames.Substitution; 
    7 import FAtiMA.wellFormedNames.SubstitutionSet; 
     5import FAtiMA.Core.AgentModel; 
     6import FAtiMA.Core.wellFormedNames.Substitution; 
     7import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
    88 
    99public class NullPlaceCondition extends PlaceCondition { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/NullTimeCondition.java

    r278 r667  
    1 package FAtiMA.conditions; 
     1package FAtiMA.Core.conditions; 
    22 
    33import java.util.ArrayList; 
    44 
    5 import FAtiMA.AgentModel; 
    6 import FAtiMA.wellFormedNames.Substitution; 
    7 import FAtiMA.wellFormedNames.SubstitutionSet; 
     5import FAtiMA.Core.AgentModel; 
     6import FAtiMA.Core.wellFormedNames.Substitution; 
     7import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
    88 
    99public class NullTimeCondition extends TimeCondition { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/PastEventCondition.java

    r603 r667  
    3030 */ 
    3131 
    32 package FAtiMA.conditions; 
     32package FAtiMA.Core.conditions; 
    3333 
    3434import java.util.ArrayList; 
     
    3939import org.xml.sax.Attributes; 
    4040 
    41 import FAtiMA.AgentModel; 
    42 import FAtiMA.memory.episodicMemory.ActionDetail; 
    43 import FAtiMA.memory.episodicMemory.SearchKey; 
    44 import FAtiMA.sensorEffector.Event; 
    45 import FAtiMA.sensorEffector.Parameter; 
    46 import FAtiMA.util.Constants; 
    47 import FAtiMA.util.enumerables.ActionEvent; 
    48 import FAtiMA.util.enumerables.EventType; 
    49 import FAtiMA.util.enumerables.GoalEvent; 
    50 import FAtiMA.wellFormedNames.Name; 
    51 import FAtiMA.wellFormedNames.Substitution; 
    52 import FAtiMA.wellFormedNames.SubstitutionSet; 
    53 import FAtiMA.wellFormedNames.Symbol; 
     41import FAtiMA.Core.AgentModel; 
     42import FAtiMA.Core.memory.episodicMemory.ActionDetail; 
     43import FAtiMA.Core.memory.episodicMemory.SearchKey; 
     44import FAtiMA.Core.sensorEffector.Event; 
     45import FAtiMA.Core.sensorEffector.Parameter; 
     46import FAtiMA.Core.util.Constants; 
     47import FAtiMA.Core.util.enumerables.ActionEvent; 
     48import FAtiMA.Core.util.enumerables.EventType; 
     49import FAtiMA.Core.util.enumerables.GoalEvent; 
     50import FAtiMA.Core.wellFormedNames.Name; 
     51import FAtiMA.Core.wellFormedNames.Substitution; 
     52import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
     53import FAtiMA.Core.wellFormedNames.Symbol; 
    5454 
    5555 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/PlaceCondition.java

    r359 r667  
    1 package FAtiMA.conditions; 
     1package FAtiMA.Core.conditions; 
    22 
    33import org.xml.sax.Attributes; 
    44 
    5 import FAtiMA.AgentModel; 
    6 import FAtiMA.exceptions.ContextParsingException; 
    7 import FAtiMA.wellFormedNames.Name; 
     5import FAtiMA.Core.AgentModel; 
     6import FAtiMA.Core.exceptions.ContextParsingException; 
     7import FAtiMA.Core.wellFormedNames.Name; 
    88 
    99/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/PredicateCondition.java

    r643 r667  
    5151 */ 
    5252 
    53 package FAtiMA.conditions; 
     53package FAtiMA.Core.conditions; 
    5454 
    5555import java.util.ArrayList; 
     
    5757import org.xml.sax.Attributes; 
    5858 
    59 import FAtiMA.AgentModel; 
    60 import FAtiMA.memory.semanticMemory.KnowledgeBase; 
    61 import FAtiMA.util.Constants; 
    62 import FAtiMA.wellFormedNames.Name; 
    63 import FAtiMA.wellFormedNames.Substitution; 
    64 import FAtiMA.wellFormedNames.Symbol; 
     59import FAtiMA.Core.AgentModel; 
     60import FAtiMA.Core.memory.semanticMemory.KnowledgeBase; 
     61import FAtiMA.Core.util.Constants; 
     62import FAtiMA.Core.wellFormedNames.Name; 
     63import FAtiMA.Core.wellFormedNames.Substitution; 
     64import FAtiMA.Core.wellFormedNames.Symbol; 
    6565 
    6666 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/PropertyCondition.java

    r643 r667  
    5252 */ 
    5353 
    54 package FAtiMA.conditions; 
     54package FAtiMA.Core.conditions; 
    5555 
    5656import java.util.ArrayList; 
     
    5858import org.xml.sax.Attributes; 
    5959 
    60 import FAtiMA.AgentModel; 
    61 import FAtiMA.util.AgentLogger; 
    62 import FAtiMA.util.Constants; 
    63 import FAtiMA.wellFormedNames.Name; 
    64 import FAtiMA.wellFormedNames.Substitution; 
    65 import FAtiMA.wellFormedNames.Symbol; 
    66 import FAtiMA.wellFormedNames.Unifier; 
     60import FAtiMA.Core.AgentModel; 
     61import FAtiMA.Core.util.AgentLogger; 
     62import FAtiMA.Core.util.Constants; 
     63import FAtiMA.Core.wellFormedNames.Name; 
     64import FAtiMA.Core.wellFormedNames.Substitution; 
     65import FAtiMA.Core.wellFormedNames.Symbol; 
     66import FAtiMA.Core.wellFormedNames.Unifier; 
    6767 
    6868 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/PropertyEqual.java

    r643 r667  
    4848 */ 
    4949 
    50 package FAtiMA.conditions; 
     50package FAtiMA.Core.conditions; 
    5151 
    52 import FAtiMA.AgentModel; 
    53 import FAtiMA.util.AgentLogger; 
    54 import FAtiMA.wellFormedNames.Name; 
    55 import FAtiMA.wellFormedNames.Symbol; 
     52import FAtiMA.Core.AgentModel; 
     53import FAtiMA.Core.util.AgentLogger; 
     54import FAtiMA.Core.wellFormedNames.Name; 
     55import FAtiMA.Core.wellFormedNames.Symbol; 
    5656 
    5757/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/PropertyGreater.java

    r643 r667  
    5151 */ 
    5252 
    53 package FAtiMA.conditions; 
     53package FAtiMA.Core.conditions; 
    5454 
    55 import FAtiMA.AgentModel; 
    56 import FAtiMA.util.AgentLogger; 
    57 import FAtiMA.wellFormedNames.Name; 
    58 import FAtiMA.wellFormedNames.Symbol; 
     55import FAtiMA.Core.AgentModel; 
     56import FAtiMA.Core.util.AgentLogger; 
     57import FAtiMA.Core.wellFormedNames.Name; 
     58import FAtiMA.Core.wellFormedNames.Symbol; 
    5959 
    6060 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/PropertyGreaterEqual.java

    r643 r667  
    2929 */ 
    3030 
    31 package FAtiMA.conditions; 
     31package FAtiMA.Core.conditions; 
    3232 
    33 import FAtiMA.AgentModel; 
    34 import FAtiMA.util.AgentLogger; 
    35 import FAtiMA.wellFormedNames.Name; 
    36 import FAtiMA.wellFormedNames.Symbol; 
     33import FAtiMA.Core.AgentModel; 
     34import FAtiMA.Core.util.AgentLogger; 
     35import FAtiMA.Core.wellFormedNames.Name; 
     36import FAtiMA.Core.wellFormedNames.Symbol; 
    3737 
    3838 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/PropertyLesser.java

    r643 r667  
    5151 */ 
    5252 
    53 package FAtiMA.conditions; 
     53package FAtiMA.Core.conditions; 
    5454 
    5555 
    56 import FAtiMA.AgentModel; 
    57 import FAtiMA.util.AgentLogger; 
    58 import FAtiMA.wellFormedNames.Name; 
    59 import FAtiMA.wellFormedNames.Symbol; 
     56import FAtiMA.Core.AgentModel; 
     57import FAtiMA.Core.util.AgentLogger; 
     58import FAtiMA.Core.wellFormedNames.Name; 
     59import FAtiMA.Core.wellFormedNames.Symbol; 
    6060 
    6161/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/PropertyLesserEqual.java

    r643 r667  
    2929 */ 
    3030 
    31 package FAtiMA.conditions; 
     31package FAtiMA.Core.conditions; 
    3232 
    33 import FAtiMA.AgentModel; 
    34 import FAtiMA.util.AgentLogger; 
    35 import FAtiMA.wellFormedNames.Name; 
    36 import FAtiMA.wellFormedNames.Symbol; 
     33import FAtiMA.Core.AgentModel; 
     34import FAtiMA.Core.util.AgentLogger; 
     35import FAtiMA.Core.wellFormedNames.Name; 
     36import FAtiMA.Core.wellFormedNames.Symbol; 
    3737 
    3838/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/PropertyNotEqual.java

    r643 r667  
    7070 */ 
    7171 
    72 package FAtiMA.conditions; 
     72package FAtiMA.Core.conditions; 
    7373 
    7474import java.util.ArrayList; 
    7575import java.util.ListIterator; 
    7676 
    77 import FAtiMA.AgentModel; 
    78 import FAtiMA.util.AgentLogger; 
    79 import FAtiMA.wellFormedNames.Inequality; 
    80 import FAtiMA.wellFormedNames.Name; 
    81 import FAtiMA.wellFormedNames.Substitution; 
    82 import FAtiMA.wellFormedNames.SubstitutionSet; 
    83 import FAtiMA.wellFormedNames.Symbol; 
     77import FAtiMA.Core.AgentModel; 
     78import FAtiMA.Core.util.AgentLogger; 
     79import FAtiMA.Core.wellFormedNames.Inequality; 
     80import FAtiMA.Core.wellFormedNames.Name; 
     81import FAtiMA.Core.wellFormedNames.Substitution; 
     82import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
     83import FAtiMA.Core.wellFormedNames.Symbol; 
    8484 
    8585 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/RecentEventCondition.java

    r594 r667  
    3333 */ 
    3434 
    35 package FAtiMA.conditions; 
     35package FAtiMA.Core.conditions; 
    3636 
    3737import java.util.ArrayList; 
    3838import java.util.ListIterator; 
    3939 
    40 import FAtiMA.AgentModel; 
    41 import FAtiMA.memory.episodicMemory.ActionDetail; 
    42 import FAtiMA.memory.episodicMemory.SearchKey; 
    43 import FAtiMA.sensorEffector.Event; 
    44 import FAtiMA.util.Constants; 
    45 import FAtiMA.wellFormedNames.Name; 
    46 import FAtiMA.wellFormedNames.Substitution; 
    47 import FAtiMA.wellFormedNames.Symbol; 
     40import FAtiMA.Core.AgentModel; 
     41import FAtiMA.Core.memory.episodicMemory.ActionDetail; 
     42import FAtiMA.Core.memory.episodicMemory.SearchKey; 
     43import FAtiMA.Core.sensorEffector.Event; 
     44import FAtiMA.Core.util.Constants; 
     45import FAtiMA.Core.wellFormedNames.Name; 
     46import FAtiMA.Core.wellFormedNames.Substitution; 
     47import FAtiMA.Core.wellFormedNames.Symbol; 
    4848 
    4949 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/SACondition.java

    r649 r667  
    1 package FAtiMA.conditions; 
     1package FAtiMA.Core.conditions; 
    22 
    33import java.util.ArrayList; 
     
    77import org.xml.sax.Attributes; 
    88 
    9 import FAtiMA.AgentModel; 
    10 import FAtiMA.wellFormedNames.Name; 
    11 import FAtiMA.wellFormedNames.Substitution; 
    12 import FAtiMA.wellFormedNames.SubstitutionSet; 
    13 import FAtiMA.wellFormedNames.Symbol; 
     9import FAtiMA.Core.AgentModel; 
     10import FAtiMA.Core.wellFormedNames.Name; 
     11import FAtiMA.Core.wellFormedNames.Substitution; 
     12import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
     13import FAtiMA.Core.wellFormedNames.Symbol; 
    1414 
    1515/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/conditions/TimeCondition.java

    r359 r667  
    1 package FAtiMA.conditions; 
     1package FAtiMA.Core.conditions; 
    22 
    33 
     
    55import org.xml.sax.Attributes; 
    66 
    7 import FAtiMA.AgentModel; 
    8 import FAtiMA.exceptions.ContextParsingException; 
    9 import FAtiMA.wellFormedNames.Name; 
     7import FAtiMA.Core.AgentModel; 
     8import FAtiMA.Core.exceptions.ContextParsingException; 
     9import FAtiMA.Core.wellFormedNames.Name; 
    1010 
    1111/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/ActionMonitor.java

    r666 r667  
    3131 */ 
    3232 
    33 package FAtiMA.deliberativeLayer; 
     33package FAtiMA.Core.deliberativeLayer; 
    3434 
    3535import java.io.Serializable; 
    3636 
    37 import FAtiMA.deliberativeLayer.plan.Step; 
    38 import FAtiMA.sensorEffector.Event; 
     37import FAtiMA.Core.deliberativeLayer.plan.Step; 
     38import FAtiMA.Core.sensorEffector.Event; 
    3939 
    4040 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/DefaultDetectThreatStrategy.java

    r666 r667  
    1 package FAtiMA.deliberativeLayer; 
     1package FAtiMA.Core.deliberativeLayer; 
    22 
    3 import FAtiMA.conditions.Condition; 
     3import FAtiMA.Core.conditions.Condition; 
    44 
    55public class DefaultDetectThreatStrategy implements IDetectThreatStrategy { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/DefaultExpectedUtility.java

    r666 r667  
    1 package FAtiMA.deliberativeLayer; 
     1package FAtiMA.Core.deliberativeLayer; 
    22 
    3 import FAtiMA.AgentModel; 
    4 import FAtiMA.deliberativeLayer.goals.ActivePursuitGoal; 
     3import FAtiMA.Core.AgentModel; 
     4import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; 
    55 
    66public class DefaultExpectedUtility implements IExpectedUtilityStrategy  
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/DefaultStrategy.java

    r666 r667  
    1 package FAtiMA.deliberativeLayer; 
     1package FAtiMA.Core.deliberativeLayer; 
    22 
    3 import FAtiMA.AgentModel; 
    4 import FAtiMA.deliberativeLayer.goals.ActivePursuitGoal; 
    5 import FAtiMA.util.Constants; 
     3import FAtiMA.Core.AgentModel; 
     4import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; 
     5import FAtiMA.Core.util.Constants; 
    66 
    77public class DefaultStrategy implements IUtilityForTargetStrategy, IProbabilityStrategy  
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/DeliberativeProcess.java

    r666 r667  
    116116 */ 
    117117  
    118 package FAtiMA.deliberativeLayer; 
     118package FAtiMA.Core.deliberativeLayer; 
    119119 
    120120import java.util.ArrayList; 
     
    124124import java.util.Set; 
    125125 
    126 import FAtiMA.AgentCore; 
    127 import FAtiMA.AgentModel; 
    128 import FAtiMA.IComponent; 
    129 import FAtiMA.ValuedAction; 
    130 import FAtiMA.Display.AgentDisplayPanel; 
    131 import FAtiMA.conditions.Condition; 
    132 import FAtiMA.deliberativeLayer.goals.ActivePursuitGoal; 
    133 import FAtiMA.deliberativeLayer.goals.Goal; 
    134 import FAtiMA.deliberativeLayer.goals.GoalLibrary; 
    135 import FAtiMA.deliberativeLayer.goals.InterestGoal; 
    136 import FAtiMA.deliberativeLayer.plan.Effect; 
    137 import FAtiMA.deliberativeLayer.plan.IPlanningOperator; 
    138 import FAtiMA.deliberativeLayer.plan.Plan; 
    139 import FAtiMA.deliberativeLayer.plan.ProtectedCondition; 
    140 import FAtiMA.deliberativeLayer.plan.Step; 
    141 import FAtiMA.emotionalState.ActiveEmotion; 
    142 import FAtiMA.emotionalState.AppraisalStructure; 
    143 import FAtiMA.exceptions.UnknownGoalException; 
     126import FAtiMA.Core.AgentCore; 
     127import FAtiMA.Core.AgentModel; 
     128import FAtiMA.Core.IComponent; 
     129import FAtiMA.Core.ValuedAction; 
     130import FAtiMA.Core.Display.AgentDisplayPanel; 
     131import FAtiMA.Core.conditions.Condition; 
     132import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; 
     133import FAtiMA.Core.deliberativeLayer.goals.Goal; 
     134import FAtiMA.Core.deliberativeLayer.goals.GoalLibrary; 
     135import FAtiMA.Core.deliberativeLayer.goals.InterestGoal; 
     136import FAtiMA.Core.deliberativeLayer.plan.Effect; 
     137import FAtiMA.Core.deliberativeLayer.plan.IPlanningOperator; 
     138import FAtiMA.Core.deliberativeLayer.plan.Plan; 
     139import FAtiMA.Core.deliberativeLayer.plan.ProtectedCondition; 
     140import FAtiMA.Core.deliberativeLayer.plan.Step; 
     141import FAtiMA.Core.emotionalState.ActiveEmotion; 
     142import FAtiMA.Core.emotionalState.AppraisalStructure; 
     143import FAtiMA.Core.exceptions.UnknownGoalException; 
     144import FAtiMA.Core.sensorEffector.Event; 
     145import FAtiMA.Core.sensorEffector.Parameter; 
     146import FAtiMA.Core.util.AgentLogger; 
     147import FAtiMA.Core.util.Constants; 
     148import FAtiMA.Core.wellFormedNames.Name; 
     149import FAtiMA.Core.wellFormedNames.Substitution; 
     150import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
     151import FAtiMA.Core.wellFormedNames.Symbol; 
     152import FAtiMA.Core.wellFormedNames.Unifier; 
    144153import FAtiMA.motivationalSystem.InvalidMotivatorTypeException; 
    145 import FAtiMA.sensorEffector.Event; 
    146 import FAtiMA.sensorEffector.Parameter; 
    147 import FAtiMA.util.AgentLogger; 
    148 import FAtiMA.util.Constants; 
    149 import FAtiMA.wellFormedNames.Name; 
    150 import FAtiMA.wellFormedNames.Substitution; 
    151 import FAtiMA.wellFormedNames.SubstitutionSet; 
    152 import FAtiMA.wellFormedNames.Symbol; 
    153 import FAtiMA.wellFormedNames.Unifier; 
    154154 
    155155 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/EmotionalPlanner.java

    r666 r667  
    9999 */ 
    100100 
    101 package FAtiMA.deliberativeLayer; 
     101package FAtiMA.Core.deliberativeLayer; 
    102102 
    103103/** 
     
    113113import java.util.ListIterator; 
    114114 
    115 import FAtiMA.AgentModel; 
    116 import FAtiMA.IntegrityValidator; 
    117 import FAtiMA.conditions.Condition; 
    118 import FAtiMA.conditions.PropertyNotEqual; 
    119 import FAtiMA.deliberativeLayer.goals.ActivePursuitGoal; 
    120 import FAtiMA.deliberativeLayer.plan.CausalConflictFlaw; 
    121 import FAtiMA.deliberativeLayer.plan.CausalLink; 
    122 import FAtiMA.deliberativeLayer.plan.Effect; 
    123 import FAtiMA.deliberativeLayer.plan.GoalThreat; 
    124 import FAtiMA.deliberativeLayer.plan.IPlanningOperator; 
    125 import FAtiMA.deliberativeLayer.plan.OpenPrecondition; 
    126 import FAtiMA.deliberativeLayer.plan.Plan; 
    127 import FAtiMA.deliberativeLayer.plan.ProtectedCondition; 
    128 import FAtiMA.deliberativeLayer.plan.Step; 
    129 import FAtiMA.emotionalState.ActiveEmotion; 
    130 import FAtiMA.emotionalState.Appraisal; 
    131 import FAtiMA.emotionalState.BaseEmotion; 
    132 import FAtiMA.exceptions.UnknownSpeechActException; 
    133 import FAtiMA.exceptions.UnspecifiedVariableException; 
    134 import FAtiMA.util.AgentLogger; 
    135 import FAtiMA.util.Constants; 
    136 import FAtiMA.wellFormedNames.Name; 
    137 import FAtiMA.wellFormedNames.Substitution; 
    138 import FAtiMA.wellFormedNames.SubstitutionSet; 
    139 import FAtiMA.wellFormedNames.Symbol; 
    140 import FAtiMA.wellFormedNames.Unifier; 
     115import FAtiMA.Core.AgentModel; 
     116import FAtiMA.Core.IntegrityValidator; 
     117import FAtiMA.Core.conditions.Condition; 
     118import FAtiMA.Core.conditions.PropertyNotEqual; 
     119import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; 
     120import FAtiMA.Core.deliberativeLayer.plan.CausalConflictFlaw; 
     121import FAtiMA.Core.deliberativeLayer.plan.CausalLink; 
     122import FAtiMA.Core.deliberativeLayer.plan.Effect; 
     123import FAtiMA.Core.deliberativeLayer.plan.GoalThreat; 
     124import FAtiMA.Core.deliberativeLayer.plan.IPlanningOperator; 
     125import FAtiMA.Core.deliberativeLayer.plan.OpenPrecondition; 
     126import FAtiMA.Core.deliberativeLayer.plan.Plan; 
     127import FAtiMA.Core.deliberativeLayer.plan.ProtectedCondition; 
     128import FAtiMA.Core.deliberativeLayer.plan.Step; 
     129import FAtiMA.Core.emotionalState.ActiveEmotion; 
     130import FAtiMA.Core.emotionalState.Appraisal; 
     131import FAtiMA.Core.emotionalState.BaseEmotion; 
     132import FAtiMA.Core.exceptions.UnknownSpeechActException; 
     133import FAtiMA.Core.exceptions.UnspecifiedVariableException; 
     134import FAtiMA.Core.util.AgentLogger; 
     135import FAtiMA.Core.util.Constants; 
     136import FAtiMA.Core.wellFormedNames.Name; 
     137import FAtiMA.Core.wellFormedNames.Substitution; 
     138import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
     139import FAtiMA.Core.wellFormedNames.Symbol; 
     140import FAtiMA.Core.wellFormedNames.Unifier; 
    141141 
    142142 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/ExpirableActionMonitor.java

    r666 r667  
    3232 */ 
    3333 
    34 package FAtiMA.deliberativeLayer; 
     34package FAtiMA.Core.deliberativeLayer; 
    3535 
    36 import FAtiMA.AgentSimulationTime; 
    37 import FAtiMA.deliberativeLayer.plan.Step; 
    38 import FAtiMA.sensorEffector.Event; 
     36import FAtiMA.Core.AgentSimulationTime; 
     37import FAtiMA.Core.deliberativeLayer.plan.Step; 
     38import FAtiMA.Core.sensorEffector.Event; 
    3939 
    4040/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/IActionFailureStrategy.java

    r666 r667  
    1 package FAtiMA.deliberativeLayer; 
     1package FAtiMA.Core.deliberativeLayer; 
    22 
    3 import FAtiMA.AgentModel; 
    4 import FAtiMA.deliberativeLayer.plan.Step; 
     3import FAtiMA.Core.AgentModel; 
     4import FAtiMA.Core.deliberativeLayer.plan.Step; 
    55 
    66public interface IActionFailureStrategy { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/IActionSuccessStrategy.java

    r666 r667  
    1 package FAtiMA.deliberativeLayer; 
     1package FAtiMA.Core.deliberativeLayer; 
    22 
    3 import FAtiMA.AgentModel; 
    4 import FAtiMA.deliberativeLayer.plan.Step; 
     3import FAtiMA.Core.AgentModel; 
     4import FAtiMA.Core.deliberativeLayer.plan.Step; 
    55 
    66public interface IActionSuccessStrategy { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/IDetectThreatStrategy.java

    r666 r667  
    1 package FAtiMA.deliberativeLayer; 
     1package FAtiMA.Core.deliberativeLayer; 
    22 
    3 import FAtiMA.conditions.Condition; 
     3import FAtiMA.Core.conditions.Condition; 
    44 
    55public interface IDetectThreatStrategy { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/IExpectedUtilityStrategy.java

    r666 r667  
    1 package FAtiMA.deliberativeLayer; 
     1package FAtiMA.Core.deliberativeLayer; 
    22 
    3 import FAtiMA.AgentModel; 
    4 import FAtiMA.deliberativeLayer.goals.ActivePursuitGoal; 
     3import FAtiMA.Core.AgentModel; 
     4import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; 
    55 
    66public interface IExpectedUtilityStrategy { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/IGoalFailureStrategy.java

    r666 r667  
    1 package FAtiMA.deliberativeLayer; 
     1package FAtiMA.Core.deliberativeLayer; 
    22 
    3 import FAtiMA.AgentModel; 
    4 import FAtiMA.deliberativeLayer.goals.ActivePursuitGoal; 
     3import FAtiMA.Core.AgentModel; 
     4import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; 
    55 
    66public interface IGoalFailureStrategy { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/IGoalSuccessStrategy.java

    r666 r667  
    1 package FAtiMA.deliberativeLayer; 
     1package FAtiMA.Core.deliberativeLayer; 
    22 
    3 import FAtiMA.AgentModel; 
    4 import FAtiMA.deliberativeLayer.goals.ActivePursuitGoal; 
     3import FAtiMA.Core.AgentModel; 
     4import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; 
    55 
    66public interface IGoalSuccessStrategy { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/IOptionsStrategy.java

    r666 r667  
    1 package FAtiMA.deliberativeLayer; 
     1package FAtiMA.Core.deliberativeLayer; 
    22 
    33import java.util.Collection; 
    44 
    5 import FAtiMA.AgentModel; 
    6 import FAtiMA.deliberativeLayer.goals.ActivePursuitGoal; 
     5import FAtiMA.Core.AgentModel; 
     6import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; 
    77 
    88public interface IOptionsStrategy { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/IProbabilityStrategy.java

    r666 r667  
    1 package FAtiMA.deliberativeLayer; 
     1package FAtiMA.Core.deliberativeLayer; 
    22 
    3 import FAtiMA.AgentModel; 
    4 import FAtiMA.deliberativeLayer.goals.ActivePursuitGoal; 
     3import FAtiMA.Core.AgentModel; 
     4import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; 
    55 
    66public interface IProbabilityStrategy { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/IUtilityForTargetStrategy.java

    r666 r667  
    1 package FAtiMA.deliberativeLayer; 
     1package FAtiMA.Core.deliberativeLayer; 
    22 
    3 import FAtiMA.AgentModel; 
    4 import FAtiMA.deliberativeLayer.goals.ActivePursuitGoal; 
     3import FAtiMA.Core.AgentModel; 
     4import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; 
    55 
    66public interface IUtilityForTargetStrategy { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/Intention.java

    r666 r667  
    3333 *                                                 to make the class easily serializable 
    3434 */ 
    35 package FAtiMA.deliberativeLayer; 
     35package FAtiMA.Core.deliberativeLayer; 
    3636 
    3737import java.io.Serializable; 
     
    3939import java.util.ListIterator; 
    4040 
    41 import FAtiMA.AgentModel; 
     41import FAtiMA.Core.AgentModel; 
     42import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; 
     43import FAtiMA.Core.deliberativeLayer.goals.Goal; 
     44import FAtiMA.Core.deliberativeLayer.plan.Plan; 
     45import FAtiMA.Core.emotionalState.ActiveEmotion; 
     46import FAtiMA.Core.emotionalState.Appraisal; 
     47import FAtiMA.Core.emotionalState.BaseEmotion; 
     48import FAtiMA.Core.emotionalState.EmotionalState; 
     49import FAtiMA.Core.sensorEffector.Event; 
     50import FAtiMA.Core.util.AgentLogger; 
    4251import FAtiMA.culture.Ritual; 
    43 import FAtiMA.deliberativeLayer.goals.ActivePursuitGoal; 
    44 import FAtiMA.deliberativeLayer.goals.Goal; 
    45 import FAtiMA.deliberativeLayer.plan.Plan; 
    46 import FAtiMA.emotionalState.ActiveEmotion; 
    47 import FAtiMA.emotionalState.Appraisal; 
    48 import FAtiMA.emotionalState.BaseEmotion; 
    49 import FAtiMA.emotionalState.EmotionalState; 
    50 import FAtiMA.sensorEffector.Event; 
    51 import FAtiMA.util.AgentLogger; 
    5252 
    5353 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/goals/ActivePursuitGoal.java

    r643 r667  
    6868 */ 
    6969 
    70 package FAtiMA.deliberativeLayer.goals; 
     70package FAtiMA.Core.deliberativeLayer.goals; 
    7171 
    7272import java.util.ArrayList; 
     
    7575import java.util.ListIterator; 
    7676 
    77 import FAtiMA.AgentModel; 
    78 import FAtiMA.IntegrityValidator; 
    79 import FAtiMA.conditions.Condition; 
    80 import FAtiMA.conditions.NewEventCondition; 
    81 import FAtiMA.conditions.RecentEventCondition; 
    82 import FAtiMA.deliberativeLayer.plan.Effect; 
    83 import FAtiMA.deliberativeLayer.plan.EffectOnDrive; 
    84 import FAtiMA.deliberativeLayer.plan.IPlanningOperator; 
    85 import FAtiMA.deliberativeLayer.plan.Plan; 
    86 import FAtiMA.exceptions.UnreachableGoalException; 
    87 import FAtiMA.util.AgentLogger; 
    88 import FAtiMA.util.Constants; 
    89 import FAtiMA.wellFormedNames.Name; 
    90 import FAtiMA.wellFormedNames.Substitution; 
    91 import FAtiMA.wellFormedNames.Symbol; 
     77import FAtiMA.Core.AgentModel; 
     78import FAtiMA.Core.IntegrityValidator; 
     79import FAtiMA.Core.conditions.Condition; 
     80import FAtiMA.Core.conditions.NewEventCondition; 
     81import FAtiMA.Core.conditions.RecentEventCondition; 
     82import FAtiMA.Core.deliberativeLayer.plan.Effect; 
     83import FAtiMA.Core.deliberativeLayer.plan.EffectOnDrive; 
     84import FAtiMA.Core.deliberativeLayer.plan.IPlanningOperator; 
     85import FAtiMA.Core.deliberativeLayer.plan.Plan; 
     86import FAtiMA.Core.exceptions.UnreachableGoalException; 
     87import FAtiMA.Core.util.AgentLogger; 
     88import FAtiMA.Core.util.Constants; 
     89import FAtiMA.Core.wellFormedNames.Name; 
     90import FAtiMA.Core.wellFormedNames.Substitution; 
     91import FAtiMA.Core.wellFormedNames.Symbol; 
    9292 
    9393 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/goals/Goal.java

    r299 r667  
    5353 */ 
    5454 
    55 package FAtiMA.deliberativeLayer.goals; 
     55package FAtiMA.Core.deliberativeLayer.goals; 
    5656 
    5757import java.io.Serializable; 
     
    5959import java.util.ListIterator; 
    6060 
    61 import FAtiMA.AgentModel; 
    62 import FAtiMA.IntegrityValidator; 
    63 import FAtiMA.conditions.Condition; 
    64 import FAtiMA.exceptions.UnreachableGoalException; 
    65 import FAtiMA.sensorEffector.Event; 
    66 import FAtiMA.sensorEffector.Parameter; 
    67 import FAtiMA.util.enumerables.EventType; 
    68 import FAtiMA.util.enumerables.GoalEvent; 
    69 import FAtiMA.wellFormedNames.IGroundable; 
    70 import FAtiMA.wellFormedNames.Name; 
    71 import FAtiMA.wellFormedNames.Substitution; 
    72 import FAtiMA.wellFormedNames.Symbol; 
     61import FAtiMA.Core.AgentModel; 
     62import FAtiMA.Core.IntegrityValidator; 
     63import FAtiMA.Core.conditions.Condition; 
     64import FAtiMA.Core.exceptions.UnreachableGoalException; 
     65import FAtiMA.Core.sensorEffector.Event; 
     66import FAtiMA.Core.sensorEffector.Parameter; 
     67import FAtiMA.Core.util.enumerables.EventType; 
     68import FAtiMA.Core.util.enumerables.GoalEvent; 
     69import FAtiMA.Core.wellFormedNames.IGroundable; 
     70import FAtiMA.Core.wellFormedNames.Name; 
     71import FAtiMA.Core.wellFormedNames.Substitution; 
     72import FAtiMA.Core.wellFormedNames.Symbol; 
    7373 
    7474 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/goals/GoalLibrary.java

    r278 r667  
    3030 */ 
    3131 
    32 package FAtiMA.deliberativeLayer.goals; 
     32package FAtiMA.Core.deliberativeLayer.goals; 
    3333 
    3434import java.io.File; 
     
    4040import javax.xml.parsers.SAXParserFactory; 
    4141 
    42 import FAtiMA.exceptions.GoalLibParsingException; 
    43 import FAtiMA.util.AgentLogger; 
    44 import FAtiMA.util.parsers.GoalLoaderHandler; 
    45 import FAtiMA.wellFormedNames.Name; 
     42import FAtiMA.Core.exceptions.GoalLibParsingException; 
     43import FAtiMA.Core.util.AgentLogger; 
     44import FAtiMA.Core.util.parsers.GoalLoaderHandler; 
     45import FAtiMA.Core.wellFormedNames.Name; 
    4646 
    4747 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/goals/InterestGoal.java

    r278 r667  
    4040 */ 
    4141 
    42 package FAtiMA.deliberativeLayer.goals; 
     42package FAtiMA.Core.deliberativeLayer.goals; 
    4343 
    4444import java.util.ArrayList; 
    4545import java.util.ListIterator; 
    4646 
    47 import FAtiMA.IntegrityValidator; 
    48 import FAtiMA.conditions.Condition; 
    49 import FAtiMA.exceptions.UnreachableGoalException; 
    50 import FAtiMA.wellFormedNames.Name; 
    51 import FAtiMA.wellFormedNames.Substitution; 
     47import FAtiMA.Core.IntegrityValidator; 
     48import FAtiMA.Core.conditions.Condition; 
     49import FAtiMA.Core.exceptions.UnreachableGoalException; 
     50import FAtiMA.Core.wellFormedNames.Name; 
     51import FAtiMA.Core.wellFormedNames.Substitution; 
    5252 
    5353 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/plan/CausalConflictFlaw.java

    r612 r667  
    3232 */ 
    3333 
    34 package FAtiMA.deliberativeLayer.plan; 
     34package FAtiMA.Core.deliberativeLayer.plan; 
    3535 
    3636import java.io.Serializable; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/plan/CausalLink.java

    r278 r667  
    3939 */ 
    4040 
    41 package FAtiMA.deliberativeLayer.plan; 
     41package FAtiMA.Core.deliberativeLayer.plan; 
    4242 
    4343import java.io.Serializable; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/plan/Effect.java

    r278 r667  
    3737 */ 
    3838 
    39 package FAtiMA.deliberativeLayer.plan; 
     39package FAtiMA.Core.deliberativeLayer.plan; 
    4040 
    4141import java.io.Serializable; 
    4242import java.util.ArrayList; 
    4343 
    44 import FAtiMA.AgentModel; 
    45 import FAtiMA.conditions.Condition; 
    46 import FAtiMA.wellFormedNames.IGroundable; 
    47 import FAtiMA.wellFormedNames.Name; 
    48 import FAtiMA.wellFormedNames.Substitution; 
     44import FAtiMA.Core.AgentModel; 
     45import FAtiMA.Core.conditions.Condition; 
     46import FAtiMA.Core.wellFormedNames.IGroundable; 
     47import FAtiMA.Core.wellFormedNames.Name; 
     48import FAtiMA.Core.wellFormedNames.Substitution; 
    4949 
    5050 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/plan/EffectOnDrive.java

    r278 r667  
    44 */ 
    55 
    6 package FAtiMA.deliberativeLayer.plan; 
     6package FAtiMA.Core.deliberativeLayer.plan; 
    77 
    88import java.io.Serializable; 
    99import java.util.ArrayList; 
    1010 
    11 import FAtiMA.conditions.Condition; 
    12 import FAtiMA.wellFormedNames.IGroundable; 
    13 import FAtiMA.wellFormedNames.Substitution; 
     11import FAtiMA.Core.conditions.Condition; 
     12import FAtiMA.Core.wellFormedNames.IGroundable; 
     13import FAtiMA.Core.wellFormedNames.Substitution; 
    1414 
    1515/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/plan/GoalThreat.java

    r278 r667  
    3030 */ 
    3131 
    32 package FAtiMA.deliberativeLayer.plan; 
     32package FAtiMA.Core.deliberativeLayer.plan; 
    3333 
    3434import java.io.Serializable; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/plan/IPlanningOperator.java

    r278 r667  
    2929 **/ 
    3030 
    31 package FAtiMA.deliberativeLayer.plan; 
     31package FAtiMA.Core.deliberativeLayer.plan; 
    3232 
    3333import java.util.ArrayList; 
    3434 
    35 import FAtiMA.AgentModel; 
    36 import FAtiMA.conditions.Condition; 
    37 import FAtiMA.wellFormedNames.IGroundable; 
    38 import FAtiMA.wellFormedNames.Name; 
    39 import FAtiMA.wellFormedNames.Symbol; 
     35import FAtiMA.Core.AgentModel; 
     36import FAtiMA.Core.conditions.Condition; 
     37import FAtiMA.Core.wellFormedNames.IGroundable; 
     38import FAtiMA.Core.wellFormedNames.Name; 
     39import FAtiMA.Core.wellFormedNames.Symbol; 
    4040 
    4141public interface IPlanningOperator extends Cloneable, IGroundable { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/plan/OpenPrecondition.java

    r278 r667  
    3434 */ 
    3535 
    36 package FAtiMA.deliberativeLayer.plan; 
     36package FAtiMA.Core.deliberativeLayer.plan; 
    3737 
    3838import java.io.Serializable; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/plan/OrderRelation.java

    r278 r667  
    3030 * João Dias: 10/07/2006 - the class is now serializable  
    3131 */ 
    32 package FAtiMA.deliberativeLayer.plan; 
     32package FAtiMA.Core.deliberativeLayer.plan; 
    3333 
    3434import java.io.Serializable; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/plan/OrderingConstraint.java

    r278 r667  
    3333 */ 
    3434 
    35 package FAtiMA.deliberativeLayer.plan; 
     35package FAtiMA.Core.deliberativeLayer.plan; 
    3636 
    3737import java.io.Serializable; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/plan/Plan.java

    r643 r667  
    103103 */ 
    104104 
    105 package FAtiMA.deliberativeLayer.plan; 
     105package FAtiMA.Core.deliberativeLayer.plan; 
    106106 
    107107import java.io.Serializable; 
     
    110110import java.util.ListIterator; 
    111111 
    112 import FAtiMA.AgentModel; 
    113 import FAtiMA.conditions.Condition; 
    114 import FAtiMA.deliberativeLayer.IDetectThreatStrategy; 
    115 import FAtiMA.util.AgentLogger; 
    116 import FAtiMA.util.Constants; 
    117 import FAtiMA.wellFormedNames.Inequality; 
    118 import FAtiMA.wellFormedNames.Substitution; 
    119 import FAtiMA.wellFormedNames.Symbol; 
     112import FAtiMA.Core.AgentModel; 
     113import FAtiMA.Core.conditions.Condition; 
     114import FAtiMA.Core.deliberativeLayer.IDetectThreatStrategy; 
     115import FAtiMA.Core.util.AgentLogger; 
     116import FAtiMA.Core.util.Constants; 
     117import FAtiMA.Core.wellFormedNames.Inequality; 
     118import FAtiMA.Core.wellFormedNames.Substitution; 
     119import FAtiMA.Core.wellFormedNames.Symbol; 
    120120 
    121121 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/plan/ProtectedCondition.java

    r278 r667  
    3131 */ 
    3232 
    33 package FAtiMA.deliberativeLayer.plan; 
     33package FAtiMA.Core.deliberativeLayer.plan; 
    3434 
    3535import java.io.Serializable; 
    3636 
    37 import FAtiMA.conditions.Condition; 
    38 import FAtiMA.deliberativeLayer.goals.Goal; 
    39 import FAtiMA.deliberativeLayer.goals.InterestGoal; 
     37import FAtiMA.Core.conditions.Condition; 
     38import FAtiMA.Core.deliberativeLayer.goals.Goal; 
     39import FAtiMA.Core.deliberativeLayer.goals.InterestGoal; 
    4040 
    4141 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/plan/Step.java

    r278 r667  
    5454 */ 
    5555 
    56 package FAtiMA.deliberativeLayer.plan; 
     56package FAtiMA.Core.deliberativeLayer.plan; 
    5757 
    5858import java.io.Serializable; 
     
    6060import java.util.ListIterator; 
    6161 
    62 import FAtiMA.AgentModel; 
    63 import FAtiMA.IntegrityValidator; 
    64 import FAtiMA.conditions.Condition; 
    65 import FAtiMA.exceptions.UnknownSpeechActException; 
    66 import FAtiMA.exceptions.UnspecifiedVariableException; 
    67 import FAtiMA.util.Constants; 
    68 import FAtiMA.wellFormedNames.Name; 
    69 import FAtiMA.wellFormedNames.Substitution; 
    70 import FAtiMA.wellFormedNames.Symbol; 
    71 import FAtiMA.wellFormedNames.Unifier; 
     62import FAtiMA.Core.AgentModel; 
     63import FAtiMA.Core.IntegrityValidator; 
     64import FAtiMA.Core.conditions.Condition; 
     65import FAtiMA.Core.exceptions.UnknownSpeechActException; 
     66import FAtiMA.Core.exceptions.UnspecifiedVariableException; 
     67import FAtiMA.Core.util.Constants; 
     68import FAtiMA.Core.wellFormedNames.Name; 
     69import FAtiMA.Core.wellFormedNames.Substitution; 
     70import FAtiMA.Core.wellFormedNames.Symbol; 
     71import FAtiMA.Core.wellFormedNames.Unifier; 
    7272 
    7373 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/emotionalState/ActiveEmotion.java

    r278 r667  
    3333 */ 
    3434 
    35 package FAtiMA.emotionalState; 
     35package FAtiMA.Core.emotionalState; 
    3636 
    37 import FAtiMA.AgentSimulationTime; 
    38 import FAtiMA.util.enumerables.EmotionType; 
     37import FAtiMA.Core.AgentSimulationTime; 
     38import FAtiMA.Core.util.enumerables.EmotionType; 
    3939 
    4040/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/emotionalState/Appraisal.java

    r645 r667  
    2727 */ 
    2828 
    29 package FAtiMA.emotionalState; 
     29package FAtiMA.Core.emotionalState; 
    3030 
    3131import java.util.ArrayList; 
    3232 
    33 import FAtiMA.AgentModel; 
    34 import FAtiMA.deliberativeLayer.goals.Goal; 
    35 import FAtiMA.sensorEffector.Event; 
     33import FAtiMA.Core.AgentModel; 
     34import FAtiMA.Core.deliberativeLayer.goals.Goal; 
     35import FAtiMA.Core.sensorEffector.Event; 
     36import FAtiMA.Core.util.Constants; 
     37import FAtiMA.Core.util.enumerables.EmotionType; 
     38import FAtiMA.Core.wellFormedNames.Name; 
    3639import FAtiMA.socialRelations.LikeRelation; 
    37 import FAtiMA.util.Constants; 
    38 import FAtiMA.util.enumerables.EmotionType; 
    39  
    40 import FAtiMA.wellFormedNames.Name; 
     40 
    4141 
    4242public abstract class Appraisal { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/emotionalState/AppraisalStructure.java

    r645 r667  
    2626 * History:  
    2727 */ 
    28 package FAtiMA.emotionalState; 
     28package FAtiMA.Core.emotionalState; 
    2929 
    3030import java.util.ArrayList; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/emotionalState/AppraisalVector.java

    r643 r667  
    2626 * History:  
    2727 */ 
    28 package FAtiMA.emotionalState; 
     28package FAtiMA.Core.emotionalState; 
    2929 
    3030public class AppraisalVector { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/emotionalState/BaseEmotion.java

    r278 r667  
    3131 */ 
    3232 
    33 package FAtiMA.emotionalState; 
     33package FAtiMA.Core.emotionalState; 
    3434 
    3535import java.io.Serializable; 
    3636 
    37 import FAtiMA.sensorEffector.Event; 
    38 import FAtiMA.util.enumerables.EmotionType; 
    39 import FAtiMA.util.enumerables.EmotionValence; 
    40 import FAtiMA.wellFormedNames.Name; 
     37import FAtiMA.Core.sensorEffector.Event; 
     38import FAtiMA.Core.util.enumerables.EmotionType; 
     39import FAtiMA.Core.util.enumerables.EmotionValence; 
     40import FAtiMA.Core.wellFormedNames.Name; 
    4141 
    4242 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/emotionalState/EmotionDisposition.java

    r278 r667  
    3131 */ 
    3232 
    33 package FAtiMA.emotionalState; 
     33package FAtiMA.Core.emotionalState; 
    3434 
    3535import java.io.Serializable; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/emotionalState/EmotionalPameters.java

    r278 r667  
    3030 * João Dias: 20/01/2004 - File created 
    3131 */ 
    32 package FAtiMA.emotionalState; 
     32package FAtiMA.Core.emotionalState; 
    3333 
    3434/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/emotionalState/EmotionalState.java

    r613 r667  
    5454 */ 
    5555 
    56 package FAtiMA.emotionalState; 
     56package FAtiMA.Core.emotionalState; 
    5757 
    5858 
     
    6464import java.util.Set; 
    6565 
    66 import FAtiMA.AgentModel; 
    67 import FAtiMA.AgentSimulationTime; 
    68 import FAtiMA.sensorEffector.Event; 
    69 import FAtiMA.util.enumerables.EmotionType; 
    70 import FAtiMA.util.enumerables.EmotionValence; 
    71 import FAtiMA.wellFormedNames.Name; 
     66import FAtiMA.Core.AgentModel; 
     67import FAtiMA.Core.AgentSimulationTime; 
     68import FAtiMA.Core.sensorEffector.Event; 
     69import FAtiMA.Core.util.enumerables.EmotionType; 
     70import FAtiMA.Core.util.enumerables.EmotionValence; 
     71import FAtiMA.Core.wellFormedNames.Name; 
    7272 
    7373 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/emotionalState/Mood.java

    r278 r667  
    3030 */ 
    3131 
    32 package FAtiMA.emotionalState; 
     32package FAtiMA.Core.emotionalState; 
    3333 
    3434import java.io.Serializable; 
    3535 
    36 import FAtiMA.AgentSimulationTime; 
    37 import FAtiMA.util.enumerables.EmotionValence; 
     36import FAtiMA.Core.AgentSimulationTime; 
     37import FAtiMA.Core.util.enumerables.EmotionValence; 
    3838 
    3939 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/exceptions/ActionsParsingException.java

    r278 r667  
    2929 */ 
    3030 
    31 package FAtiMA.exceptions; 
     31package FAtiMA.Core.exceptions; 
    3232 
    3333public class ActionsParsingException extends Exception { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/exceptions/AgentParsingException.java

    r278 r667  
    2929 */ 
    3030 
    31 package FAtiMA.exceptions; 
     31package FAtiMA.Core.exceptions; 
    3232 
    3333 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/exceptions/ContextParsingException.java

    r278 r667  
    1 package FAtiMA.exceptions; 
     1package FAtiMA.Core.exceptions; 
    22 
    33public class ContextParsingException extends Exception { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/exceptions/DuplicateSymbolTranslatorEntry.java

    r278 r667  
    1 package FAtiMA.exceptions; 
     1package FAtiMA.Core.exceptions; 
    22 
    33public class DuplicateSymbolTranslatorEntry extends Exception { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/exceptions/GoalLibParsingException.java

    r278 r667  
    2929 */ 
    3030 
    31 package FAtiMA.exceptions; 
     31package FAtiMA.Core.exceptions; 
    3232 
    3333public class GoalLibParsingException extends Exception { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/exceptions/InvalidDimensionTypeException.java

    r278 r667  
    1 package FAtiMA.exceptions; 
     1package FAtiMA.Core.exceptions; 
    22 
    33public class InvalidDimensionTypeException extends Exception { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/exceptions/InvalidEmotionTypeException.java

    r278 r667  
    2929 */ 
    3030 
    31 package FAtiMA.exceptions; 
     31package FAtiMA.Core.exceptions; 
    3232 
    3333public class InvalidEmotionTypeException extends Exception { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/exceptions/InvalidMoodOperatorException.java

    r278 r667  
    2929 */ 
    3030 
    31 package FAtiMA.exceptions; 
     31package FAtiMA.Core.exceptions; 
    3232 
    3333public class InvalidMoodOperatorException extends Exception { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/exceptions/InvalidReplaceUnboundVariableException.java

    r278 r667  
    3030 */ 
    3131 
    32 package FAtiMA.exceptions; 
     32package FAtiMA.Core.exceptions; 
    3333 
    3434public class InvalidReplaceUnboundVariableException extends RuntimeException { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/exceptions/NoMoodOperatorDefinedException.java

    r278 r667  
    2929 */ 
    3030 
    31 package FAtiMA.exceptions; 
     31package FAtiMA.Core.exceptions; 
    3232 
    3333public class NoMoodOperatorDefinedException extends Exception { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/exceptions/UnknownGoalException.java

    r278 r667  
    2929 */ 
    3030 
    31 package FAtiMA.exceptions; 
     31package FAtiMA.Core.exceptions; 
    3232 
    3333public class UnknownGoalException extends Exception { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/exceptions/UnknownSpeechActException.java

    r278 r667  
    2929 */ 
    3030 
    31 package FAtiMA.exceptions; 
     31package FAtiMA.Core.exceptions; 
    3232 
    3333public class UnknownSpeechActException extends Exception { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/exceptions/UnreachableGoalException.java

    r278 r667  
    2929 */ 
    3030 
    31 package FAtiMA.exceptions; 
     31package FAtiMA.Core.exceptions; 
    3232 
    3333public class UnreachableGoalException extends Exception { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/exceptions/UnspecifiedVariableException.java

    r278 r667  
    3030 */ 
    3131 
    32 package FAtiMA.exceptions; 
     32package FAtiMA.Core.exceptions; 
    3333 
    3434public class UnspecifiedVariableException extends Exception { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/ICommonalities.java

    r666 r667  
    1 package FAtiMA.memory; 
     1package FAtiMA.Core.memory; 
    22 
    33import java.util.ArrayList; 
    44import java.util.Hashtable; 
    55 
    6 import FAtiMA.memory.episodicMemory.ActionDetail; 
     6import FAtiMA.Core.memory.episodicMemory.ActionDetail; 
    77 
    88public interface ICommonalities { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/ICompoundCue.java

    r666 r667  
    1 package FAtiMA.memory; 
     1package FAtiMA.Core.memory; 
    22 
    33 
    4 import FAtiMA.memory.episodicMemory.ActionDetail; 
    5 import FAtiMA.memory.episodicMemory.EpisodicMemory; 
     4import FAtiMA.Core.memory.episodicMemory.ActionDetail; 
     5import FAtiMA.Core.memory.episodicMemory.EpisodicMemory; 
    66 
    77public interface ICompoundCue { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/ISpreadActivate.java

    r666 r667  
    1 package FAtiMA.memory; 
     1package FAtiMA.Core.memory; 
    22 
    33import java.util.ArrayList; 
    44import java.util.Hashtable; 
    55 
    6 import FAtiMA.memory.episodicMemory.ActionDetail; 
    7 import FAtiMA.memory.episodicMemory.EpisodicMemory;; 
     6import FAtiMA.Core.memory.episodicMemory.ActionDetail; 
     7import FAtiMA.Core.memory.episodicMemory.EpisodicMemory; 
    88 
    99public interface ISpreadActivate { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/Memory.java

    r666 r667  
    3030 * **/ 
    3131 
    32 package FAtiMA.memory; 
     32package FAtiMA.Core.memory; 
    3333 
    3434 
    3535import java.io.Serializable; 
    3636 
    37 import FAtiMA.memory.episodicMemory.EpisodicMemory; 
    38 import FAtiMA.memory.generalMemory.GeneralMemory; 
    39 import FAtiMA.memory.semanticMemory.SemanticMemory; 
     37import FAtiMA.Core.memory.episodicMemory.EpisodicMemory; 
     38import FAtiMA.Core.memory.generalMemory.GeneralMemory; 
     39import FAtiMA.Core.memory.semanticMemory.SemanticMemory; 
    4040 
    4141 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/episodicMemory/ActionDetail.java

    r643 r667  
    3838 * Meiyii Lim: 13/03/2009 - Moved the class from FAtiMA.autobiographicalMemory package 
    3939 */ 
    40 package FAtiMA.memory.episodicMemory; 
     40package FAtiMA.Core.memory.episodicMemory; 
    4141 
    4242import java.io.Serializable; 
     
    4444import java.util.ListIterator; 
    4545 
    46 import FAtiMA.emotionalState.ActiveEmotion; 
    47 import FAtiMA.emotionalState.BaseEmotion; 
    48 import FAtiMA.memory.Memory; 
    49 import FAtiMA.memory.semanticMemory.KnowledgeSlot; 
    50 import FAtiMA.sensorEffector.Event; 
    51 import FAtiMA.sensorEffector.Parameter; 
     46import FAtiMA.Core.emotionalState.ActiveEmotion; 
     47import FAtiMA.Core.emotionalState.BaseEmotion; 
     48import FAtiMA.Core.memory.Memory; 
     49import FAtiMA.Core.memory.semanticMemory.KnowledgeSlot; 
     50import FAtiMA.Core.sensorEffector.Event; 
     51import FAtiMA.Core.sensorEffector.Parameter; 
     52import FAtiMA.Core.util.Constants; 
     53import FAtiMA.Core.util.enumerables.ActionEvent; 
     54import FAtiMA.Core.util.enumerables.EmotionType; 
     55import FAtiMA.Core.util.enumerables.EmotionValence; 
     56import FAtiMA.Core.util.enumerables.EventType; 
     57import FAtiMA.Core.util.enumerables.GoalEvent; 
    5258import FAtiMA.socialRelations.LikeRelation; 
    5359import FAtiMA.socialRelations.RespectRelation; 
    54 import FAtiMA.util.Constants; 
    55 import FAtiMA.util.enumerables.ActionEvent; 
    56 import FAtiMA.util.enumerables.EmotionType; 
    57 import FAtiMA.util.enumerables.EmotionValence; 
    58 import FAtiMA.util.enumerables.EventType; 
    59 import FAtiMA.util.enumerables.GoalEvent; 
    6060 
    6161 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/episodicMemory/ActionDetailComparator.java

    r278 r667  
    2929 */ 
    3030 
    31 package FAtiMA.memory.episodicMemory; 
     31package FAtiMA.Core.memory.episodicMemory; 
    3232 
    3333import java.util.Comparator; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/episodicMemory/AutobiographicalMemory.java

    r629 r667  
    4242 * **/ 
    4343 
    44 package FAtiMA.memory.episodicMemory; 
     44package FAtiMA.Core.memory.episodicMemory; 
    4545 
    4646 
     
    4949import java.util.ListIterator; 
    5050 
    51 import FAtiMA.deliberativeLayer.goals.Goal; 
    52 import FAtiMA.memory.Memory; 
    53 import FAtiMA.sensorEffector.Event; 
    54 import FAtiMA.util.AgentLogger; 
     51import FAtiMA.Core.deliberativeLayer.goals.Goal; 
     52import FAtiMA.Core.memory.Memory; 
     53import FAtiMA.Core.sensorEffector.Event; 
     54import FAtiMA.Core.util.AgentLogger; 
    5555 
    5656public class AutobiographicalMemory implements Serializable { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/episodicMemory/EpisodicMemory.java

    r623 r667  
    1 package FAtiMA.memory.episodicMemory; 
     1package FAtiMA.Core.memory.episodicMemory; 
    22 
    33import java.io.Serializable; 
     
    55import java.util.ListIterator; 
    66 
    7 import FAtiMA.deliberativeLayer.goals.Goal; 
    8 import FAtiMA.emotionalState.ActiveEmotion; 
    9 import FAtiMA.memory.Memory; 
    10 import FAtiMA.sensorEffector.Event; 
    11 import FAtiMA.sensorEffector.Parameter; 
    12 import FAtiMA.util.Constants; 
    13 import FAtiMA.util.enumerables.ActionEvent; 
    14 import FAtiMA.util.enumerables.EmotionType; 
    15 import FAtiMA.util.enumerables.EventType; 
    16 import FAtiMA.util.enumerables.GoalEvent; 
    17 import FAtiMA.wellFormedNames.Name; 
     7import FAtiMA.Core.deliberativeLayer.goals.Goal; 
     8import FAtiMA.Core.emotionalState.ActiveEmotion; 
     9import FAtiMA.Core.memory.Memory; 
     10import FAtiMA.Core.sensorEffector.Event; 
     11import FAtiMA.Core.sensorEffector.Parameter; 
     12import FAtiMA.Core.util.Constants; 
     13import FAtiMA.Core.util.enumerables.ActionEvent; 
     14import FAtiMA.Core.util.enumerables.EmotionType; 
     15import FAtiMA.Core.util.enumerables.EventType; 
     16import FAtiMA.Core.util.enumerables.GoalEvent; 
     17import FAtiMA.Core.wellFormedNames.Name; 
    1818 
    1919public class EpisodicMemory implements Serializable { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/episodicMemory/MemoryEpisode.java

    r616 r667  
    3333 * **/ 
    3434 
    35 package FAtiMA.memory.episodicMemory; 
     35package FAtiMA.Core.memory.episodicMemory; 
    3636 
    3737import java.io.Serializable; 
     
    4141import java.util.ListIterator; 
    4242 
    43 import FAtiMA.deliberativeLayer.goals.Goal; 
    44 import FAtiMA.emotionalState.BaseEmotion; 
    45 import FAtiMA.sensorEffector.Event; 
    46 import FAtiMA.util.Constants; 
    47 import FAtiMA.util.enumerables.EmotionValence; 
    48 import FAtiMA.memory.Memory; 
     43import FAtiMA.Core.deliberativeLayer.goals.Goal; 
     44import FAtiMA.Core.emotionalState.BaseEmotion; 
     45import FAtiMA.Core.memory.Memory; 
     46import FAtiMA.Core.sensorEffector.Event; 
     47import FAtiMA.Core.util.Constants; 
     48import FAtiMA.Core.util.enumerables.EmotionValence; 
    4949 
    5050 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/episodicMemory/SearchKey.java

    r282 r667  
    3131 * **/ 
    3232 
    33 package FAtiMA.memory.episodicMemory; 
     33package FAtiMA.Core.memory.episodicMemory; 
    3434 
    3535public class SearchKey { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/episodicMemory/ShortTermEpisodicMemory.java

    r616 r667  
    2929 * **/ 
    3030 
    31 package FAtiMA.memory.episodicMemory; 
     31package FAtiMA.Core.memory.episodicMemory; 
    3232 
    3333import java.io.Serializable; 
     
    3535import java.util.ListIterator; 
    3636 
    37 import FAtiMA.deliberativeLayer.goals.Goal; 
    38 import FAtiMA.emotionalState.ActiveEmotion; 
    39 import FAtiMA.memory.Memory; 
    40 import FAtiMA.sensorEffector.Event; 
     37import FAtiMA.Core.deliberativeLayer.goals.Goal; 
     38import FAtiMA.Core.emotionalState.ActiveEmotion; 
     39import FAtiMA.Core.memory.Memory; 
     40import FAtiMA.Core.sensorEffector.Event; 
    4141 
    4242 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/episodicMemory/SummaryGenerator.java

    r278 r667  
    2929 * **/ 
    3030 
    31 package FAtiMA.memory.episodicMemory; 
     31package FAtiMA.Core.memory.episodicMemory; 
    3232 
    3333import java.util.ArrayList; 
    3434 
    35 import FAtiMA.emotionalState.BaseEmotion; 
    36 import FAtiMA.sensorEffector.Parameter; 
    37 import FAtiMA.sensorEffector.SpeechAct; 
    38 import FAtiMA.util.Constants; 
    39 import FAtiMA.util.enumerables.EmotionType; 
    40 import FAtiMA.wellFormedNames.Name; 
    41 import FAtiMA.memory.Memory; 
     35import FAtiMA.Core.emotionalState.BaseEmotion; 
     36import FAtiMA.Core.memory.Memory; 
     37import FAtiMA.Core.sensorEffector.Parameter; 
     38import FAtiMA.Core.sensorEffector.SpeechAct; 
     39import FAtiMA.Core.util.Constants; 
     40import FAtiMA.Core.util.enumerables.EmotionType; 
     41import FAtiMA.Core.wellFormedNames.Name; 
    4242 
    4343/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/episodicMemory/Time.java

    r629 r667  
    2929 * **/ 
    3030 
    31 package FAtiMA.memory.episodicMemory; 
     31package FAtiMA.Core.memory.episodicMemory; 
    3232 
    3333import java.io.Serializable; 
     
    3535import java.util.GregorianCalendar; 
    3636 
    37 import FAtiMA.AgentSimulationTime; 
     37import FAtiMA.Core.AgentSimulationTime; 
    3838 
    3939 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/generalMemory/AttributeItem.java

    r629 r667  
    2727 * **/ 
    2828 
    29 package FAtiMA.memory.generalMemory; 
     29package FAtiMA.Core.memory.generalMemory; 
    3030 
    3131import java.io.Serializable; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/generalMemory/AttributeItemSet.java

    r629 r667  
    3030 * **/ 
    3131 
    32 package FAtiMA.memory.generalMemory; 
     32package FAtiMA.Core.memory.generalMemory; 
    3333 
    3434import java.io.Serializable; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/generalMemory/GER.java

    r629 r667  
    2727 * **/ 
    2828 
    29 package FAtiMA.memory.generalMemory; 
     29package FAtiMA.Core.memory.generalMemory; 
    3030 
    3131import java.io.Serializable; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/generalMemory/GeneralMemory.java

    r444 r667  
    2828 * **/ 
    2929 
    30 package FAtiMA.memory.generalMemory; 
     30package FAtiMA.Core.memory.generalMemory; 
    3131 
    3232import java.io.Serializable; 
     
    3434import java.util.ListIterator; 
    3535 
    36 import FAtiMA.memory.episodicMemory.EpisodicMemory; 
     36import FAtiMA.Core.memory.episodicMemory.EpisodicMemory; 
    3737 
    3838public class GeneralMemory implements Serializable { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/generalMemory/Generalisation.java

    r629 r667  
    2929 * **/ 
    3030 
    31 package FAtiMA.memory.generalMemory; 
     31package FAtiMA.Core.memory.generalMemory; 
    3232 
    3333import java.io.Serializable; 
     
    3737import java.util.ListIterator; 
    3838 
    39 import FAtiMA.memory.episodicMemory.ActionDetail; 
    40 import FAtiMA.memory.episodicMemory.EpisodicMemory; 
    41 import FAtiMA.memory.episodicMemory.MemoryEpisode; 
     39import FAtiMA.Core.memory.episodicMemory.ActionDetail; 
     40import FAtiMA.Core.memory.episodicMemory.EpisodicMemory; 
     41import FAtiMA.Core.memory.episodicMemory.MemoryEpisode; 
    4242 
    4343public class Generalisation implements Serializable { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/semanticMemory/KnowledgeBase.java

    r326 r667  
    6969 */ 
    7070 
    71 package FAtiMA.memory.semanticMemory; 
     71package FAtiMA.Core.memory.semanticMemory; 
    7272 
    7373import java.io.Serializable; 
     
    7777import java.util.ListIterator; 
    7878 
    79 import FAtiMA.deliberativeLayer.plan.Step; 
    80 import FAtiMA.wellFormedNames.Name; 
    81 import FAtiMA.wellFormedNames.Substitution; 
    82 import FAtiMA.wellFormedNames.SubstitutionSet; 
    83 import FAtiMA.wellFormedNames.Symbol; 
     79import FAtiMA.Core.deliberativeLayer.plan.Step; 
     80import FAtiMA.Core.wellFormedNames.Name; 
     81import FAtiMA.Core.wellFormedNames.Substitution; 
     82import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
     83import FAtiMA.Core.wellFormedNames.Symbol; 
    8484 
    8585 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/semanticMemory/KnowledgeSlot.java

    r326 r667  
    3333 */ 
    3434 
    35 package FAtiMA.memory.semanticMemory; 
     35package FAtiMA.Core.memory.semanticMemory; 
    3636 
    3737import java.io.Serializable; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/semanticMemory/SemanticMemory.java

    r643 r667  
    1 package FAtiMA.memory.semanticMemory; 
     1package FAtiMA.Core.memory.semanticMemory; 
    22 
    33import java.io.Serializable; 
     
    55import java.util.ListIterator; 
    66 
    7 import FAtiMA.AgentModel; 
    8 import FAtiMA.conditions.Condition; 
    9 import FAtiMA.deliberativeLayer.plan.Effect; 
    10 import FAtiMA.deliberativeLayer.plan.Step; 
    11 import FAtiMA.wellFormedNames.Name; 
    12 import FAtiMA.wellFormedNames.SubstitutionSet; 
    13 import FAtiMA.wellFormedNames.Symbol; 
     7import FAtiMA.Core.AgentModel; 
     8import FAtiMA.Core.conditions.Condition; 
     9import FAtiMA.Core.deliberativeLayer.plan.Effect; 
     10import FAtiMA.Core.deliberativeLayer.plan.Step; 
     11import FAtiMA.Core.wellFormedNames.Name; 
     12import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
     13import FAtiMA.Core.wellFormedNames.Symbol; 
    1414 
    1515public class SemanticMemory implements Serializable { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/memory/semanticMemory/WorkingMemory.java

    r616 r667  
    3737 
    3838 
    39 package FAtiMA.memory.semanticMemory; 
     39package FAtiMA.Core.memory.semanticMemory; 
    4040 
    4141 
     
    4646 
    4747 
    48 import FAtiMA.wellFormedNames.Name; 
    49 import FAtiMA.wellFormedNames.Substitution; 
    50 import FAtiMA.wellFormedNames.SubstitutionSet; 
    51 import FAtiMA.wellFormedNames.Symbol; 
     48import FAtiMA.Core.wellFormedNames.Name; 
     49import FAtiMA.Core.wellFormedNames.Substitution; 
     50import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
     51import FAtiMA.Core.wellFormedNames.Symbol; 
    5252 
    5353 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/reactiveLayer/Action.java

    r629 r667  
    4343 */ 
    4444 
    45 package FAtiMA.reactiveLayer; 
     45package FAtiMA.Core.reactiveLayer; 
    4646 
    4747import java.io.Serializable; 
     
    5050import java.util.ListIterator; 
    5151 
    52 import FAtiMA.AgentModel; 
    53 import FAtiMA.IIntegrityTester; 
    54 import FAtiMA.IntegrityValidator; 
    55 import FAtiMA.ValuedAction; 
    56 import FAtiMA.conditions.Condition; 
    57 import FAtiMA.emotionalState.ActiveEmotion; 
    58 import FAtiMA.emotionalState.BaseEmotion; 
    59 import FAtiMA.exceptions.UnknownSpeechActException; 
    60 import FAtiMA.sensorEffector.Event; 
    61 import FAtiMA.wellFormedNames.IGroundable; 
    62 import FAtiMA.wellFormedNames.Name; 
    63 import FAtiMA.wellFormedNames.Substitution; 
    64 import FAtiMA.wellFormedNames.SubstitutionSet; 
     52import FAtiMA.Core.AgentModel; 
     53import FAtiMA.Core.IIntegrityTester; 
     54import FAtiMA.Core.IntegrityValidator; 
     55import FAtiMA.Core.ValuedAction; 
     56import FAtiMA.Core.conditions.Condition; 
     57import FAtiMA.Core.emotionalState.ActiveEmotion; 
     58import FAtiMA.Core.emotionalState.BaseEmotion; 
     59import FAtiMA.Core.exceptions.UnknownSpeechActException; 
     60import FAtiMA.Core.sensorEffector.Event; 
     61import FAtiMA.Core.wellFormedNames.IGroundable; 
     62import FAtiMA.Core.wellFormedNames.Name; 
     63import FAtiMA.Core.wellFormedNames.Substitution; 
     64import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
    6565 
    6666 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/reactiveLayer/ActionTendencies.java

    r284 r667  
    3232 */ 
    3333 
    34 package FAtiMA.reactiveLayer; 
     34package FAtiMA.Core.reactiveLayer; 
    3535 
    3636import java.io.Serializable; 
     
    4040import java.util.ListIterator; 
    4141 
    42 import FAtiMA.AgentModel; 
    43 import FAtiMA.AgentSimulationTime; 
    44 import FAtiMA.IntegrityValidator; 
    45 import FAtiMA.ValuedAction; 
    46 import FAtiMA.conditions.Condition; 
    47 import FAtiMA.emotionalState.BaseEmotion; 
    48 import FAtiMA.emotionalState.EmotionalState; 
    49 import FAtiMA.exceptions.UnknownSpeechActException; 
    50 import FAtiMA.util.AgentLogger; 
    51 import FAtiMA.wellFormedNames.Name; 
    52 import FAtiMA.wellFormedNames.Substitution; 
    53 import FAtiMA.wellFormedNames.Unifier; 
     42import FAtiMA.Core.AgentModel; 
     43import FAtiMA.Core.AgentSimulationTime; 
     44import FAtiMA.Core.IntegrityValidator; 
     45import FAtiMA.Core.ValuedAction; 
     46import FAtiMA.Core.conditions.Condition; 
     47import FAtiMA.Core.emotionalState.BaseEmotion; 
     48import FAtiMA.Core.emotionalState.EmotionalState; 
     49import FAtiMA.Core.exceptions.UnknownSpeechActException; 
     50import FAtiMA.Core.util.AgentLogger; 
     51import FAtiMA.Core.wellFormedNames.Name; 
     52import FAtiMA.Core.wellFormedNames.Substitution; 
     53import FAtiMA.Core.wellFormedNames.Unifier; 
    5454 
    5555 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/reactiveLayer/EmotionalReactionTreeNode.java

    r278 r667  
    4242 */ 
    4343 
    44 package FAtiMA.reactiveLayer; 
     44package FAtiMA.Core.reactiveLayer; 
    4545 
    4646import java.io.Serializable; 
     
    5050import java.util.Map; 
    5151 
    52 import FAtiMA.IntegrityValidator; 
    53 import FAtiMA.exceptions.UnknownSpeechActException; 
    54 import FAtiMA.sensorEffector.Event; 
    55 import FAtiMA.sensorEffector.Parameter; 
     52import FAtiMA.Core.IntegrityValidator; 
     53import FAtiMA.Core.exceptions.UnknownSpeechActException; 
     54import FAtiMA.Core.sensorEffector.Event; 
     55import FAtiMA.Core.sensorEffector.Parameter; 
    5656 
    5757 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/reactiveLayer/IReactionNode.java

    r278 r667  
    1 package FAtiMA.reactiveLayer; 
     1package FAtiMA.Core.reactiveLayer; 
    22 
    3 import FAtiMA.IIntegrityTester; 
    4 import FAtiMA.sensorEffector.Event; 
     3import FAtiMA.Core.IIntegrityTester; 
     4import FAtiMA.Core.sensorEffector.Event; 
    55 
    66public interface IReactionNode extends Cloneable, IIntegrityTester{ 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/reactiveLayer/Reaction.java

    r284 r667  
    3535 */ 
    3636 
    37 package FAtiMA.reactiveLayer; 
     37package FAtiMA.Core.reactiveLayer; 
    3838 
    3939import java.io.Serializable; 
     
    4141import java.util.ListIterator; 
    4242 
    43 import FAtiMA.IntegrityValidator; 
    44 import FAtiMA.exceptions.UnknownSpeechActException; 
    45 import FAtiMA.sensorEffector.Event; 
    46 import FAtiMA.sensorEffector.Parameter; 
    47 import FAtiMA.wellFormedNames.IGroundable; 
    48 import FAtiMA.wellFormedNames.Name; 
    49 import FAtiMA.wellFormedNames.Substitution; 
    50 import FAtiMA.wellFormedNames.Symbol; 
     43import FAtiMA.Core.IntegrityValidator; 
     44import FAtiMA.Core.exceptions.UnknownSpeechActException; 
     45import FAtiMA.Core.sensorEffector.Event; 
     46import FAtiMA.Core.sensorEffector.Parameter; 
     47import FAtiMA.Core.wellFormedNames.IGroundable; 
     48import FAtiMA.Core.wellFormedNames.Name; 
     49import FAtiMA.Core.wellFormedNames.Substitution; 
     50import FAtiMA.Core.wellFormedNames.Symbol; 
    5151 
    5252 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/reactiveLayer/ReactiveProcess.java

    r645 r667  
    5959 */ 
    6060 
    61 package FAtiMA.reactiveLayer; 
     61package FAtiMA.Core.reactiveLayer; 
    6262 
    6363import java.util.ArrayList; 
    6464import java.util.ListIterator; 
    6565 
    66 import FAtiMA.AgentCore; 
    67 import FAtiMA.AgentModel; 
    68 import FAtiMA.IComponent; 
    69 import FAtiMA.ValuedAction; 
    70 import FAtiMA.Display.AgentDisplayPanel; 
     66import FAtiMA.Core.AgentCore; 
     67import FAtiMA.Core.AgentModel; 
     68import FAtiMA.Core.IComponent; 
     69import FAtiMA.Core.ValuedAction; 
     70import FAtiMA.Core.Display.AgentDisplayPanel; 
     71import FAtiMA.Core.emotionalState.ActiveEmotion; 
     72import FAtiMA.Core.emotionalState.Appraisal; 
     73import FAtiMA.Core.emotionalState.AppraisalStructure; 
     74import FAtiMA.Core.emotionalState.BaseEmotion; 
     75import FAtiMA.Core.memory.episodicMemory.ActionDetail; 
     76import FAtiMA.Core.sensorEffector.Event; 
     77import FAtiMA.Core.util.Constants; 
     78import FAtiMA.Core.wellFormedNames.Name; 
    7179import FAtiMA.ToM.ModelOfOther; 
    72 import FAtiMA.emotionalState.ActiveEmotion; 
    73 import FAtiMA.emotionalState.Appraisal; 
    74 import FAtiMA.emotionalState.AppraisalStructure; 
    75 import FAtiMA.emotionalState.BaseEmotion; 
    76 import FAtiMA.memory.episodicMemory.ActionDetail; 
    77 import FAtiMA.sensorEffector.Event; 
    7880import FAtiMA.socialRelations.LikeRelation; 
    79 import FAtiMA.util.Constants; 
    80 import FAtiMA.wellFormedNames.Name; 
    8181 
    8282/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/sensorEffector/Event.java

    r614 r667  
    4949 */ 
    5050 
    51 package FAtiMA.sensorEffector; 
     51package FAtiMA.Core.sensorEffector; 
    5252 
    5353import java.io.Serializable; 
     
    5757 
    5858 
    59 import FAtiMA.AgentSimulationTime; 
    60 import FAtiMA.util.Constants; 
    61 import FAtiMA.wellFormedNames.Name; 
    62 import FAtiMA.wellFormedNames.Substitution; 
    63 import FAtiMA.wellFormedNames.Symbol; 
     59import FAtiMA.Core.AgentSimulationTime; 
     60import FAtiMA.Core.util.Constants; 
     61import FAtiMA.Core.wellFormedNames.Name; 
     62import FAtiMA.Core.wellFormedNames.Substitution; 
     63import FAtiMA.Core.wellFormedNames.Symbol; 
    6464 
    6565 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/sensorEffector/IONRemoteAgent.java

    r651 r667  
    4949 */ 
    5050 
    51 package FAtiMA.sensorEffector; 
     51package FAtiMA.Core.sensorEffector; 
    5252 
    5353import java.io.IOException; 
     
    5858import java.util.StringTokenizer; 
    5959 
    60 import FAtiMA.AgentCore; 
     60import FAtiMA.Core.AgentCore; 
     61import FAtiMA.Core.util.AgentLogger; 
     62import FAtiMA.Core.util.Constants; 
     63import FAtiMA.Core.util.enumerables.ActionEvent; 
     64import FAtiMA.Core.wellFormedNames.Name; 
     65import FAtiMA.Core.wellFormedNames.Symbol; 
    6166import FAtiMA.culture.SymbolTranslator; 
    62 import FAtiMA.util.AgentLogger; 
    63 import FAtiMA.util.Constants; 
    64 import FAtiMA.util.enumerables.ActionEvent; 
    65 import FAtiMA.wellFormedNames.Name; 
    66 import FAtiMA.wellFormedNames.Symbol; 
    6767 
    6868/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/sensorEffector/Parameter.java

    r278 r667  
    3434 */ 
    3535 
    36 package FAtiMA.sensorEffector; 
     36package FAtiMA.Core.sensorEffector; 
    3737 
    3838import java.io.Serializable; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/sensorEffector/RemoteAction.java

    r278 r667  
    3939 
    4040 
    41 package FAtiMA.sensorEffector; 
     41package FAtiMA.Core.sensorEffector; 
    4242 
    4343import java.io.ByteArrayInputStream; 
     
    5151import org.xml.sax.InputSource; 
    5252 
    53 import FAtiMA.AgentModel; 
    54 import FAtiMA.ValuedAction; 
    55 import FAtiMA.emotionalState.ActiveEmotion; 
    56 import FAtiMA.util.enumerables.EventType; 
    57 import FAtiMA.util.parsers.RemoteActionHandler; 
    58 import FAtiMA.wellFormedNames.Symbol; 
     53import FAtiMA.Core.AgentModel; 
     54import FAtiMA.Core.ValuedAction; 
     55import FAtiMA.Core.emotionalState.ActiveEmotion; 
     56import FAtiMA.Core.util.enumerables.EventType; 
     57import FAtiMA.Core.util.parsers.RemoteActionHandler; 
     58import FAtiMA.Core.wellFormedNames.Symbol; 
    5959 
    6060 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/sensorEffector/RemoteAgent.java

    r651 r667  
    7070 */ 
    7171 
    72 package FAtiMA.sensorEffector; 
     72package FAtiMA.Core.sensorEffector; 
    7373 
    7474 
     
    8787import java.util.Hashtable; 
    8888 
    89 import FAtiMA.AgentCore; 
    90 import FAtiMA.AgentModel; 
    91 import FAtiMA.AgentSimulationTime; 
    92 import FAtiMA.ValuedAction; 
    93 import FAtiMA.emotionalState.ActiveEmotion; 
    94 import FAtiMA.emotionalState.EmotionalState; 
     89import FAtiMA.Core.AgentCore; 
     90import FAtiMA.Core.AgentModel; 
     91import FAtiMA.Core.AgentSimulationTime; 
     92import FAtiMA.Core.ValuedAction; 
     93import FAtiMA.Core.emotionalState.ActiveEmotion; 
     94import FAtiMA.Core.emotionalState.EmotionalState; 
     95import FAtiMA.Core.util.AgentLogger; 
     96import FAtiMA.Core.util.parsers.SocketListener; 
     97import FAtiMA.Core.wellFormedNames.Name; 
     98import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
    9599import FAtiMA.socialRelations.LikeRelation; 
    96100import FAtiMA.socialRelations.RespectRelation; 
    97 import FAtiMA.util.AgentLogger; 
    98 import FAtiMA.util.parsers.SocketListener; 
    99 import FAtiMA.wellFormedNames.Name; 
    100 import FAtiMA.wellFormedNames.SubstitutionSet; 
    101101 
    102102 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/sensorEffector/SpeechAct.java

    r614 r667  
    5757 */ 
    5858 
    59 package FAtiMA.sensorEffector; 
     59package FAtiMA.Core.sensorEffector; 
    6060 
    6161import java.io.ByteArrayInputStream; 
     
    6868import org.xml.sax.InputSource; 
    6969 
    70 import FAtiMA.AgentModel; 
    71 import FAtiMA.ValuedAction; 
    72 import FAtiMA.util.enumerables.EventType; 
    73 import FAtiMA.util.parsers.SpeechActHandler; 
    74 import FAtiMA.wellFormedNames.Name; 
    75 import FAtiMA.wellFormedNames.Symbol; 
     70import FAtiMA.Core.AgentModel; 
     71import FAtiMA.Core.ValuedAction; 
     72import FAtiMA.Core.util.enumerables.EventType; 
     73import FAtiMA.Core.util.parsers.SpeechActHandler; 
     74import FAtiMA.Core.wellFormedNames.Name; 
     75import FAtiMA.Core.wellFormedNames.Symbol; 
    7676 
    7777 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/sensorEffector/WorldSimulatorRemoteAgent.java

    r651 r667  
    1 package FAtiMA.sensorEffector; 
     1package FAtiMA.Core.sensorEffector; 
    22 
    33import java.io.IOException; 
     
    1010 
    1111 
    12 import FAtiMA.AgentCore; 
     12import FAtiMA.Core.AgentCore; 
     13import FAtiMA.Core.util.AgentLogger; 
     14import FAtiMA.Core.util.Constants; 
     15import FAtiMA.Core.util.enumerables.ActionEvent; 
     16import FAtiMA.Core.util.enumerables.EventType; 
     17import FAtiMA.Core.wellFormedNames.Name; 
     18import FAtiMA.Core.wellFormedNames.Symbol; 
    1319import FAtiMA.culture.SymbolTranslator; 
    14 import FAtiMA.util.AgentLogger; 
    15 import FAtiMA.util.Constants; 
    16 import FAtiMA.util.enumerables.ActionEvent; 
    17 import FAtiMA.util.enumerables.EventType; 
    18 import FAtiMA.wellFormedNames.Name; 
    19 import FAtiMA.wellFormedNames.Symbol; 
    2020 
    2121public class WorldSimulatorRemoteAgent extends RemoteAgent { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/AgentLogger.java

    r666 r667  
    1 package FAtiMA.util; 
     1package FAtiMA.Core.util; 
    22 
    33import java.io.BufferedWriter; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/ApplicationLogger.java

    r666 r667  
    1 package FAtiMA.util; 
     1package FAtiMA.Core.util; 
    22 
    33import java.io.FileOutputStream; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/ConfigurationManager.java

    r666 r667  
    1 package FAtiMA.util; 
     1package FAtiMA.Core.util; 
    22 
    33import java.io.File; 
     
    1212import org.xml.sax.SAXException; 
    1313 
    14 import FAtiMA.AgentCore; 
    15 import FAtiMA.util.enumerables.AgentPlatform; 
    16 import FAtiMA.util.parsers.ScenarioLoaderHandler; 
     14import FAtiMA.Core.AgentCore; 
     15import FAtiMA.Core.util.enumerables.AgentPlatform; 
     16import FAtiMA.Core.util.parsers.ScenarioLoaderHandler; 
    1717 
    1818/* 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/Constants.java

    r666 r667  
    1 package FAtiMA.util; 
     1package FAtiMA.Core.util; 
    22 
    3 import FAtiMA.wellFormedNames.*; 
     3import FAtiMA.Core.wellFormedNames.*; 
    44 
    55public abstract class Constants { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/VersionChecker.java

    r666 r667  
    1 package FAtiMA.util; 
     1package FAtiMA.Core.util; 
    22 
    33 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/enumerables/ActionEvent.java

    r286 r667  
    44 */ 
    55 
    6 package FAtiMA.util.enumerables; 
     6package FAtiMA.Core.util.enumerables; 
    77 
    88/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/enumerables/AgentPlatform.java

    r278 r667  
    1 package FAtiMA.util.enumerables; 
     1package FAtiMA.Core.util.enumerables; 
    22 
    33public abstract class AgentPlatform { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/enumerables/CulturalDimensionType.java

    r278 r667  
    1 package FAtiMA.util.enumerables; 
     1package FAtiMA.Core.util.enumerables; 
    22 
    3 import FAtiMA.exceptions.InvalidDimensionTypeException; 
     3import FAtiMA.Core.exceptions.InvalidDimensionTypeException; 
    44 
    55public class CulturalDimensionType { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/enumerables/EmotionType.java

    r278 r667  
    2828 */ 
    2929 
    30 package FAtiMA.util.enumerables; 
     30package FAtiMA.Core.util.enumerables; 
    3131 
    32 import FAtiMA.exceptions.InvalidEmotionTypeException; 
     32import FAtiMA.Core.exceptions.InvalidEmotionTypeException; 
    3333 
    3434/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/enumerables/EmotionValence.java

    r278 r667  
    2929 */ 
    3030 
    31 package FAtiMA.util.enumerables; 
     31package FAtiMA.Core.util.enumerables; 
    3232 
    3333/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/enumerables/EventType.java

    r278 r667  
    55 
    66 
    7 package FAtiMA.util.enumerables; 
     7package FAtiMA.Core.util.enumerables; 
    88 
    99 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/enumerables/GoalEvent.java

    r299 r667  
    44 */ 
    55 
    6 package FAtiMA.util.enumerables; 
     6package FAtiMA.Core.util.enumerables; 
    77 
    88 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/enumerables/RelationType.java

    r278 r667  
    1 package FAtiMA.util.enumerables; 
     1package FAtiMA.Core.util.enumerables; 
    22 
    3 import FAtiMA.exceptions.InvalidEmotionTypeException; 
     3import FAtiMA.Core.exceptions.InvalidEmotionTypeException; 
    44 
    55public class RelationType { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/parsers/ActionsLoaderHandler.java

    r643 r667  
    4141 */ 
    4242 
    43 package FAtiMA.util.parsers; 
     43package FAtiMA.Core.util.parsers; 
    4444 
    4545import java.util.ArrayList; 
     
    4949import org.xml.sax.Attributes; 
    5050 
    51 import FAtiMA.AgentModel; 
    52 import FAtiMA.conditions.EmotionCondition; 
    53 import FAtiMA.conditions.NewEventCondition; 
    54 import FAtiMA.conditions.PastEventCondition; 
    55 import FAtiMA.conditions.RecentEventCondition; 
    56 import FAtiMA.conditions.MoodCondition; 
    57 import FAtiMA.conditions.PredicateCondition; 
    58 import FAtiMA.conditions.PropertyCondition; 
    59 import FAtiMA.conditions.SACondition; 
    60 import FAtiMA.deliberativeLayer.plan.Effect; 
    61 import FAtiMA.deliberativeLayer.plan.EffectOnDrive; 
    62 import FAtiMA.deliberativeLayer.plan.Step; 
    63 import FAtiMA.exceptions.ContextParsingException; 
    64 import FAtiMA.exceptions.InvalidEmotionTypeException; 
     51import FAtiMA.Core.AgentModel; 
     52import FAtiMA.Core.conditions.EmotionCondition; 
     53import FAtiMA.Core.conditions.MoodCondition; 
     54import FAtiMA.Core.conditions.NewEventCondition; 
     55import FAtiMA.Core.conditions.PastEventCondition; 
     56import FAtiMA.Core.conditions.PredicateCondition; 
     57import FAtiMA.Core.conditions.PropertyCondition; 
     58import FAtiMA.Core.conditions.RecentEventCondition; 
     59import FAtiMA.Core.conditions.SACondition; 
     60import FAtiMA.Core.deliberativeLayer.plan.Effect; 
     61import FAtiMA.Core.deliberativeLayer.plan.EffectOnDrive; 
     62import FAtiMA.Core.deliberativeLayer.plan.Step; 
     63import FAtiMA.Core.exceptions.ContextParsingException; 
     64import FAtiMA.Core.exceptions.InvalidEmotionTypeException; 
     65import FAtiMA.Core.util.Constants; 
     66import FAtiMA.Core.util.enumerables.ActionEvent; 
     67import FAtiMA.Core.util.enumerables.EventType; 
     68import FAtiMA.Core.wellFormedNames.Name; 
     69import FAtiMA.Core.wellFormedNames.Substitution; 
     70import FAtiMA.Core.wellFormedNames.Symbol; 
    6571import FAtiMA.motivationalSystem.MotivatorCondition; 
    6672import FAtiMA.socialRelations.LikeCondition; 
    67 import FAtiMA.util.Constants; 
    68 import FAtiMA.util.enumerables.ActionEvent; 
    69 import FAtiMA.util.enumerables.EventType; 
    70 import FAtiMA.wellFormedNames.Name; 
    71 import FAtiMA.wellFormedNames.Substitution; 
    72 import FAtiMA.wellFormedNames.Symbol; 
    7373 
    7474 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/parsers/AgentLoaderHandler.java

    r646 r667  
    4848 */ 
    4949 
    50 package FAtiMA.util.parsers; 
     50package FAtiMA.Core.util.parsers; 
    5151 
    5252import org.xml.sax.Attributes; 
    5353 
    54 import FAtiMA.AgentModel; 
    55 import FAtiMA.conditions.EmotionCondition; 
    56 import FAtiMA.conditions.RecentEventCondition; 
    57 import FAtiMA.conditions.MoodCondition; 
    58 import FAtiMA.conditions.PastEventCondition; 
    59 import FAtiMA.conditions.PredicateCondition; 
    60 import FAtiMA.conditions.PropertyCondition; 
    61 import FAtiMA.deliberativeLayer.DeliberativeProcess; 
    62 import FAtiMA.emotionalState.BaseEmotion; 
    63 import FAtiMA.emotionalState.EmotionDisposition; 
    64 import FAtiMA.emotionalState.EmotionalState; 
    65 import FAtiMA.exceptions.InvalidEmotionTypeException; 
    66 import FAtiMA.exceptions.UnknownGoalException; 
    67 import FAtiMA.reactiveLayer.Action; 
    68 import FAtiMA.reactiveLayer.Reaction; 
    69 import FAtiMA.reactiveLayer.ReactiveProcess; 
    70 import FAtiMA.sensorEffector.Event; 
     54import FAtiMA.Core.AgentModel; 
     55import FAtiMA.Core.conditions.EmotionCondition; 
     56import FAtiMA.Core.conditions.MoodCondition; 
     57import FAtiMA.Core.conditions.PastEventCondition; 
     58import FAtiMA.Core.conditions.PredicateCondition; 
     59import FAtiMA.Core.conditions.PropertyCondition; 
     60import FAtiMA.Core.conditions.RecentEventCondition; 
     61import FAtiMA.Core.deliberativeLayer.DeliberativeProcess; 
     62import FAtiMA.Core.emotionalState.BaseEmotion; 
     63import FAtiMA.Core.emotionalState.EmotionDisposition; 
     64import FAtiMA.Core.emotionalState.EmotionalState; 
     65import FAtiMA.Core.exceptions.InvalidEmotionTypeException; 
     66import FAtiMA.Core.exceptions.UnknownGoalException; 
     67import FAtiMA.Core.reactiveLayer.Action; 
     68import FAtiMA.Core.reactiveLayer.Reaction; 
     69import FAtiMA.Core.reactiveLayer.ReactiveProcess; 
     70import FAtiMA.Core.sensorEffector.Event; 
     71import FAtiMA.Core.util.AgentLogger; 
     72import FAtiMA.Core.util.Constants; 
     73import FAtiMA.Core.util.enumerables.EmotionType; 
     74import FAtiMA.Core.wellFormedNames.Name; 
     75import FAtiMA.Core.wellFormedNames.Substitution; 
     76import FAtiMA.Core.wellFormedNames.Symbol; 
    7177import FAtiMA.socialRelations.LikeRelation; 
    7278import FAtiMA.socialRelations.RespectRelation; 
    73 import FAtiMA.util.AgentLogger; 
    74 import FAtiMA.util.Constants; 
    75 import FAtiMA.util.enumerables.EmotionType; 
    76 import FAtiMA.wellFormedNames.Name; 
    77 import FAtiMA.wellFormedNames.Substitution; 
    78 import FAtiMA.wellFormedNames.Symbol; 
    7979import FAtiMA.motivationalSystem.InvalidMotivatorTypeException; 
    8080import FAtiMA.motivationalSystem.Motivator; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/parsers/BinaryStringConverter.java

    r375 r667  
    1 package FAtiMA.util.parsers; 
     1package FAtiMA.Core.util.parsers; 
    22 
    33/** this class contains methods to convert binary data (a byte array) into 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/parsers/GoalLoaderHandler.java

    r643 r667  
    3939 */ 
    4040 
    41 package FAtiMA.util.parsers; 
     41package FAtiMA.Core.util.parsers; 
    4242 
    4343import java.util.ArrayList; 
     
    4545import org.xml.sax.Attributes; 
    4646 
    47 import FAtiMA.conditions.EmotionCondition; 
    48 import FAtiMA.conditions.MoodCondition; 
    49 import FAtiMA.conditions.NewEventCondition; 
    50 import FAtiMA.conditions.PastEventCondition; 
    51 import FAtiMA.conditions.PredicateCondition; 
    52 import FAtiMA.conditions.PropertyCondition; 
    53 import FAtiMA.conditions.RecentEventCondition; 
     47import FAtiMA.Core.conditions.EmotionCondition; 
     48import FAtiMA.Core.conditions.MoodCondition; 
     49import FAtiMA.Core.conditions.NewEventCondition; 
     50import FAtiMA.Core.conditions.PastEventCondition; 
     51import FAtiMA.Core.conditions.PredicateCondition; 
     52import FAtiMA.Core.conditions.PropertyCondition; 
     53import FAtiMA.Core.conditions.RecentEventCondition; 
     54import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; 
     55import FAtiMA.Core.deliberativeLayer.goals.Goal; 
     56import FAtiMA.Core.deliberativeLayer.goals.InterestGoal; 
     57import FAtiMA.Core.exceptions.InvalidEmotionTypeException; 
     58import FAtiMA.Core.util.AgentLogger; 
     59import FAtiMA.Core.util.Constants; 
     60import FAtiMA.Core.wellFormedNames.Name; 
     61import FAtiMA.Core.wellFormedNames.Substitution; 
     62import FAtiMA.Core.wellFormedNames.Symbol; 
    5463import FAtiMA.culture.RitualCondition; 
    55 import FAtiMA.deliberativeLayer.goals.ActivePursuitGoal; 
    56 import FAtiMA.deliberativeLayer.goals.Goal; 
    57 import FAtiMA.deliberativeLayer.goals.InterestGoal; 
    58 import FAtiMA.exceptions.InvalidEmotionTypeException; 
    5964import FAtiMA.socialRelations.LikeCondition; 
    60 import FAtiMA.util.AgentLogger; 
    61 import FAtiMA.util.Constants; 
    62 import FAtiMA.wellFormedNames.Name; 
    63 import FAtiMA.wellFormedNames.Substitution; 
    64 import FAtiMA.wellFormedNames.Symbol; 
    6565 
    6666 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/parsers/NeedsLoaderHandler.java

    r646 r667  
    1 package FAtiMA.util.parsers; 
     1package FAtiMA.Core.util.parsers; 
    22 
    33import org.xml.sax.Attributes; 
    44 
    5 import FAtiMA.AgentModel; 
    6 import FAtiMA.deliberativeLayer.DeliberativeProcess; 
    7 import FAtiMA.emotionalState.EmotionalState; 
     5import FAtiMA.Core.AgentModel; 
     6import FAtiMA.Core.deliberativeLayer.DeliberativeProcess; 
     7import FAtiMA.Core.emotionalState.EmotionalState; 
     8import FAtiMA.Core.reactiveLayer.ReactiveProcess; 
     9import FAtiMA.Core.util.AgentLogger; 
     10import FAtiMA.Core.util.Constants; 
     11import FAtiMA.Core.wellFormedNames.Substitution; 
     12import FAtiMA.Core.wellFormedNames.Symbol; 
    813import FAtiMA.motivationalSystem.InvalidMotivatorTypeException; 
    914import FAtiMA.motivationalSystem.Motivator; 
    1015import FAtiMA.motivationalSystem.MotivatorType; 
    11 import FAtiMA.reactiveLayer.ReactiveProcess; 
    12 import FAtiMA.util.AgentLogger; 
    13 import FAtiMA.util.Constants; 
    14 import FAtiMA.wellFormedNames.Substitution; 
    15 import FAtiMA.wellFormedNames.Symbol; 
    1616 
    1717public class NeedsLoaderHandler  extends ReflectXMLHandler { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/parsers/ReflectXMLHandler.java

    r426 r667  
    1111 * João Dias: 17/01/2004 - File created 
    1212 */ 
    13 package FAtiMA.util.parsers; 
     13package FAtiMA.Core.util.parsers; 
    1414 
    1515import java.lang.reflect.InvocationTargetException; 
     
    2222import org.xml.sax.helpers.DefaultHandler; 
    2323 
    24 import FAtiMA.util.VersionChecker; 
     24import FAtiMA.Core.util.VersionChecker; 
    2525 
    2626public abstract class ReflectXMLHandler extends DefaultHandler { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/parsers/RemoteActionHandler.java

    r278 r667  
    2828 */ 
    2929 
    30 package FAtiMA.util.parsers; 
     30package FAtiMA.Core.util.parsers; 
    3131 
    3232import org.xml.sax.Attributes; 
    3333 
    34 import FAtiMA.sensorEffector.RemoteAction; 
     34import FAtiMA.Core.sensorEffector.RemoteAction; 
    3535 
    3636 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/parsers/ScenarioLoaderHandler.java

    r663 r667  
    1 package FAtiMA.util.parsers; 
     1package FAtiMA.Core.util.parsers; 
    22 
    33import java.util.ArrayList; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/parsers/SocketListener.java

    r278 r667  
    2828 */ 
    2929 
    30 package FAtiMA.util.parsers; 
     30package FAtiMA.Core.util.parsers; 
    3131 
    3232import java.io.BufferedReader; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/parsers/SpeechActHandler.java

    r278 r667  
    2929 */ 
    3030 
    31 package FAtiMA.util.parsers; 
     31package FAtiMA.Core.util.parsers; 
    3232 
    3333import org.xml.sax.Attributes; 
    3434 
    35 import FAtiMA.sensorEffector.SpeechAct; 
     35import FAtiMA.Core.sensorEffector.SpeechAct; 
    3636 
    3737 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/wellFormedNames/ComposedName.java

    r278 r667  
    4343 */ 
    4444 
    45 package FAtiMA.wellFormedNames; 
     45package FAtiMA.Core.wellFormedNames; 
    4646 
    4747import java.io.Serializable; 
     
    5050import java.util.StringTokenizer; 
    5151 
    52 import FAtiMA.memory.Memory; 
     52import FAtiMA.Core.memory.Memory; 
    5353 
    5454/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/wellFormedNames/IGroundable.java

    r278 r667  
    2929 **/ 
    3030 
    31 package FAtiMA.wellFormedNames; 
     31package FAtiMA.Core.wellFormedNames; 
    3232 
    3333import java.util.ArrayList; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/wellFormedNames/Inequality.java

    r278 r667  
    3333 *                                             deprecated 
    3434 */ 
    35 package FAtiMA.wellFormedNames; 
     35package FAtiMA.Core.wellFormedNames; 
    3636 
    3737import java.io.Serializable; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/wellFormedNames/Name.java

    r278 r667  
    3535 */ 
    3636 
    37 package FAtiMA.wellFormedNames; 
     37package FAtiMA.Core.wellFormedNames; 
    3838 
    3939import java.io.Serializable; 
     
    4141import java.util.StringTokenizer; 
    4242 
    43 import FAtiMA.memory.Memory; 
     43import FAtiMA.Core.memory.Memory; 
    4444 
    4545 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/wellFormedNames/Substitution.java

    r278 r667  
    3737 */ 
    3838 
    39 package FAtiMA.wellFormedNames; 
     39package FAtiMA.Core.wellFormedNames; 
    4040 
    4141import java.io.Serializable; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/wellFormedNames/SubstitutionSet.java

    r278 r667  
    3232 */ 
    3333 
    34 package FAtiMA.wellFormedNames; 
     34package FAtiMA.Core.wellFormedNames; 
    3535 
    3636/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/wellFormedNames/Symbol.java

    r278 r667  
    3636 */ 
    3737 
    38 package FAtiMA.wellFormedNames; 
     38package FAtiMA.Core.wellFormedNames; 
    3939 
    4040import java.io.Serializable; 
     
    4242import java.util.ListIterator; 
    4343 
    44 import FAtiMA.memory.Memory; 
     44import FAtiMA.Core.memory.Memory; 
    4545 
    4646 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/wellFormedNames/Unifier.java

    r278 r667  
    3333 */ 
    3434 
    35 package FAtiMA.wellFormedNames; 
     35package FAtiMA.Core.wellFormedNames; 
    3636 
    3737import java.util.ArrayList; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/ToM/DetectThreatStrategy.java

    r643 r667  
    11package FAtiMA.ToM; 
    22 
    3 import FAtiMA.conditions.Condition; 
    4 import FAtiMA.deliberativeLayer.DefaultDetectThreatStrategy; 
    5 import FAtiMA.util.Constants; 
     3import FAtiMA.Core.conditions.Condition; 
     4import FAtiMA.Core.deliberativeLayer.DefaultDetectThreatStrategy; 
     5import FAtiMA.Core.util.Constants; 
    66 
    77public class DetectThreatStrategy extends DefaultDetectThreatStrategy { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/ToM/ModelOfOther.java

    r660 r667  
    66import java.util.HashMap; 
    77 
    8 import FAtiMA.AgentCore; 
    9 import FAtiMA.AgentModel; 
    10 import FAtiMA.IComponent; 
    11 import FAtiMA.Display.AgentDisplay; 
    12 import FAtiMA.deliberativeLayer.DeliberativeProcess; 
    13 import FAtiMA.emotionalState.EmotionDisposition; 
    14 import FAtiMA.emotionalState.EmotionalState; 
    15 import FAtiMA.memory.ICompoundCue; 
    16 import FAtiMA.memory.ISpreadActivate; 
    17 import FAtiMA.memory.Memory; 
     8import FAtiMA.Core.AgentCore; 
     9import FAtiMA.Core.AgentModel; 
     10import FAtiMA.Core.IComponent; 
     11import FAtiMA.Core.Display.AgentDisplay; 
     12import FAtiMA.Core.deliberativeLayer.DeliberativeProcess; 
     13import FAtiMA.Core.emotionalState.EmotionDisposition; 
     14import FAtiMA.Core.emotionalState.EmotionalState; 
     15import FAtiMA.Core.memory.ICompoundCue; 
     16import FAtiMA.Core.memory.ISpreadActivate; 
     17import FAtiMA.Core.memory.Memory; 
     18import FAtiMA.Core.reactiveLayer.ActionTendencies; 
     19import FAtiMA.Core.reactiveLayer.EmotionalReactionTreeNode; 
     20import FAtiMA.Core.reactiveLayer.ReactiveProcess; 
     21import FAtiMA.Core.sensorEffector.Event; 
     22import FAtiMA.Core.wellFormedNames.Symbol; 
    1823import FAtiMA.motivationalSystem.MotivationalState; 
    1924import FAtiMA.motivationalSystem.Motivator; 
    20 import FAtiMA.reactiveLayer.ActionTendencies; 
    21 import FAtiMA.reactiveLayer.EmotionalReactionTreeNode; 
    22 import FAtiMA.reactiveLayer.ReactiveProcess; 
    23 import FAtiMA.sensorEffector.Event; 
    24 import FAtiMA.wellFormedNames.Symbol; 
    2525 
    2626public class ModelOfOther implements AgentModel, Serializable { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/ToM/ModelOfOtherPanel.java

    r657 r667  
    44import javax.swing.JTabbedPane; 
    55 
    6 import FAtiMA.AgentCore; 
    7 import FAtiMA.AgentModel; 
    8 import FAtiMA.IComponent; 
    9 import FAtiMA.Display.ActionTendenciesPanel; 
    10 import FAtiMA.Display.AgentDisplayPanel; 
    11 import FAtiMA.Display.EmotionalStatePanel; 
    12 import FAtiMA.Display.KnowledgeBasePanel; 
    13 import FAtiMA.Display.ShortTermMemoryPanel; 
     6import FAtiMA.Core.AgentCore; 
     7import FAtiMA.Core.AgentModel; 
     8import FAtiMA.Core.IComponent; 
     9import FAtiMA.Core.Display.ActionTendenciesPanel; 
     10import FAtiMA.Core.Display.AgentDisplayPanel; 
     11import FAtiMA.Core.Display.EmotionalStatePanel; 
     12import FAtiMA.Core.Display.KnowledgeBasePanel; 
     13import FAtiMA.Core.Display.ShortTermMemoryPanel; 
    1414 
    1515public class ModelOfOtherPanel extends AgentDisplayPanel { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/ToM/ToMComponent.java

    r666 r667  
    66import com.sun.org.apache.bcel.internal.generic.FADD; 
    77 
    8 import FAtiMA.AgentCore; 
    9 import FAtiMA.AgentModel; 
    10 import FAtiMA.IComponent; 
    11 import FAtiMA.IGetModelStrategy; 
    12 import FAtiMA.Display.AgentDisplayPanel; 
    13 import FAtiMA.deliberativeLayer.IUtilityForTargetStrategy; 
    14 import FAtiMA.deliberativeLayer.goals.ActivePursuitGoal; 
    15 import FAtiMA.emotionalState.ActiveEmotion; 
    16 import FAtiMA.emotionalState.AppraisalStructure; 
    17 import FAtiMA.memory.semanticMemory.KnowledgeSlot; 
    18 import FAtiMA.sensorEffector.Event; 
    19 import FAtiMA.util.Constants; 
    20 import FAtiMA.wellFormedNames.Name; 
    21 import FAtiMA.wellFormedNames.Symbol; 
     8import FAtiMA.Core.AgentCore; 
     9import FAtiMA.Core.AgentModel; 
     10import FAtiMA.Core.IComponent; 
     11import FAtiMA.Core.IGetModelStrategy; 
     12import FAtiMA.Core.Display.AgentDisplayPanel; 
     13import FAtiMA.Core.deliberativeLayer.IUtilityForTargetStrategy; 
     14import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; 
     15import FAtiMA.Core.emotionalState.ActiveEmotion; 
     16import FAtiMA.Core.emotionalState.AppraisalStructure; 
     17import FAtiMA.Core.memory.semanticMemory.KnowledgeSlot; 
     18import FAtiMA.Core.sensorEffector.Event; 
     19import FAtiMA.Core.util.Constants; 
     20import FAtiMA.Core.wellFormedNames.Name; 
     21import FAtiMA.Core.wellFormedNames.Symbol; 
    2222 
    2323public class ToMComponent implements IComponent, IGetModelStrategy, IUtilityForTargetStrategy { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/ToM/ToMPanel.java

    r657 r667  
    66import javax.swing.JTabbedPane; 
    77 
    8 import FAtiMA.AgentCore; 
    9 import FAtiMA.AgentModel; 
    10 import FAtiMA.Display.AgentDisplayPanel; 
     8import FAtiMA.Core.AgentCore; 
     9import FAtiMA.Core.AgentModel; 
     10import FAtiMA.Core.Display.AgentDisplayPanel; 
    1111 
    1212public class ToMPanel extends AgentDisplayPanel { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/culture/CulturalDimensionsComponent.java

    r651 r667  
    99import javax.xml.parsers.SAXParser; 
    1010import javax.xml.parsers.SAXParserFactory; 
    11 import FAtiMA.AgentCore; 
    12 import FAtiMA.AgentModel; 
    13 import FAtiMA.IComponent; 
    14 import FAtiMA.Display.AgentDisplayPanel; 
    15 import FAtiMA.conditions.Condition; 
    16 import FAtiMA.deliberativeLayer.IExpectedUtilityStrategy; 
    17 import FAtiMA.deliberativeLayer.IOptionsStrategy; 
    18 import FAtiMA.deliberativeLayer.IUtilityForTargetStrategy; 
    19 import FAtiMA.deliberativeLayer.goals.ActivePursuitGoal; 
    20 import FAtiMA.emotionalState.ActiveEmotion; 
    21 import FAtiMA.emotionalState.AppraisalStructure; 
    22 import FAtiMA.sensorEffector.Event; 
    23 import FAtiMA.util.AgentLogger; 
    24 import FAtiMA.util.Constants; 
    25 import FAtiMA.util.VersionChecker; 
    26 import FAtiMA.util.enumerables.CulturalDimensionType; 
    27 import FAtiMA.wellFormedNames.Name; 
    28 import FAtiMA.wellFormedNames.SubstitutionSet; 
    29 import FAtiMA.wellFormedNames.Symbol; 
     11 
     12import FAtiMA.Core.AgentCore; 
     13import FAtiMA.Core.AgentModel; 
     14import FAtiMA.Core.IComponent; 
     15import FAtiMA.Core.Display.AgentDisplayPanel; 
     16import FAtiMA.Core.conditions.Condition; 
     17import FAtiMA.Core.deliberativeLayer.IExpectedUtilityStrategy; 
     18import FAtiMA.Core.deliberativeLayer.IOptionsStrategy; 
     19import FAtiMA.Core.deliberativeLayer.IUtilityForTargetStrategy; 
     20import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; 
     21import FAtiMA.Core.emotionalState.ActiveEmotion; 
     22import FAtiMA.Core.emotionalState.AppraisalStructure; 
     23import FAtiMA.Core.sensorEffector.Event; 
     24import FAtiMA.Core.util.AgentLogger; 
     25import FAtiMA.Core.util.Constants; 
     26import FAtiMA.Core.util.VersionChecker; 
     27import FAtiMA.Core.util.enumerables.CulturalDimensionType; 
     28import FAtiMA.Core.wellFormedNames.Name; 
     29import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
     30import FAtiMA.Core.wellFormedNames.Symbol; 
    3031 
    3132 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/culture/CultureLoaderHandler.java

    r643 r667  
    3434import org.xml.sax.Attributes; 
    3535 
    36 import FAtiMA.AgentModel; 
    37 import FAtiMA.conditions.Context; 
    38 import FAtiMA.conditions.EmotionCondition; 
    39 import FAtiMA.conditions.MoodCondition; 
    40 import FAtiMA.conditions.NewEventCondition; 
    41 import FAtiMA.conditions.PastEventCondition; 
    42 import FAtiMA.conditions.PlaceCondition; 
    43 import FAtiMA.conditions.PredicateCondition; 
    44 import FAtiMA.conditions.PropertyCondition; 
    45 import FAtiMA.conditions.RecentEventCondition; 
    46 import FAtiMA.conditions.TimeCondition; 
     36import FAtiMA.Core.AgentModel; 
     37import FAtiMA.Core.conditions.Context; 
     38import FAtiMA.Core.conditions.EmotionCondition; 
     39import FAtiMA.Core.conditions.MoodCondition; 
     40import FAtiMA.Core.conditions.NewEventCondition; 
     41import FAtiMA.Core.conditions.PastEventCondition; 
     42import FAtiMA.Core.conditions.PlaceCondition; 
     43import FAtiMA.Core.conditions.PredicateCondition; 
     44import FAtiMA.Core.conditions.PropertyCondition; 
     45import FAtiMA.Core.conditions.RecentEventCondition; 
     46import FAtiMA.Core.conditions.TimeCondition; 
     47import FAtiMA.Core.deliberativeLayer.DeliberativeProcess; 
     48import FAtiMA.Core.exceptions.ContextParsingException; 
     49import FAtiMA.Core.exceptions.DuplicateSymbolTranslatorEntry; 
     50import FAtiMA.Core.exceptions.InvalidDimensionTypeException; 
     51import FAtiMA.Core.exceptions.InvalidEmotionTypeException; 
     52import FAtiMA.Core.exceptions.UnknownGoalException; 
     53import FAtiMA.Core.reactiveLayer.Reaction; 
     54import FAtiMA.Core.reactiveLayer.ReactiveProcess; 
     55import FAtiMA.Core.sensorEffector.Event; 
     56import FAtiMA.Core.util.AgentLogger; 
     57import FAtiMA.Core.util.enumerables.CulturalDimensionType; 
     58import FAtiMA.Core.util.parsers.ReflectXMLHandler; 
     59import FAtiMA.Core.wellFormedNames.Name; 
     60import FAtiMA.Core.wellFormedNames.Substitution; 
     61import FAtiMA.Core.wellFormedNames.Symbol; 
    4762import FAtiMA.culture.CulturalDimensionsComponent; 
    48 import FAtiMA.deliberativeLayer.DeliberativeProcess; 
    49 import FAtiMA.exceptions.ContextParsingException; 
    50 import FAtiMA.exceptions.DuplicateSymbolTranslatorEntry; 
    51 import FAtiMA.exceptions.InvalidDimensionTypeException; 
    52 import FAtiMA.exceptions.InvalidEmotionTypeException; 
    53 import FAtiMA.exceptions.UnknownGoalException; 
    54 import FAtiMA.reactiveLayer.Reaction; 
    55 import FAtiMA.reactiveLayer.ReactiveProcess; 
    56 import FAtiMA.sensorEffector.Event; 
    57 import FAtiMA.util.AgentLogger; 
    58 import FAtiMA.util.enumerables.CulturalDimensionType; 
    59 import FAtiMA.util.parsers.ReflectXMLHandler; 
    60 import FAtiMA.wellFormedNames.Name; 
    61 import FAtiMA.wellFormedNames.Substitution; 
    62 import FAtiMA.wellFormedNames.Symbol; 
    6363 
    6464 
     
    8080        public CultureLoaderHandler(AgentModel aM, CulturalDimensionsComponent cDM) { 
    8181                _rituals = new ArrayList<Ritual>(); 
    82                 _self = new Substitution(new Symbol("[SELF]"), new Symbol(FAtiMA.util.Constants.SELF)); 
     82                _self = new Substitution(new Symbol("[SELF]"), new Symbol(FAtiMA.Core.util.Constants.SELF)); 
    8383                _reactiveLayer = aM.getReactiveLayer();  
    8484                _deliberativeLayer = aM.getDeliberativeLayer(); 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/culture/Ritual.java

    r643 r667  
    3737import java.util.ListIterator; 
    3838 
    39 import FAtiMA.ActionLibrary; 
    40 import FAtiMA.AgentModel; 
    41 import FAtiMA.conditions.Condition; 
    42 import FAtiMA.deliberativeLayer.goals.ActivePursuitGoal; 
    43 import FAtiMA.deliberativeLayer.plan.CausalLink; 
    44 import FAtiMA.deliberativeLayer.plan.Effect; 
    45 import FAtiMA.deliberativeLayer.plan.IPlanningOperator; 
    46 import FAtiMA.deliberativeLayer.plan.OrderingConstraint; 
    47 import FAtiMA.deliberativeLayer.plan.Plan; 
    48 import FAtiMA.deliberativeLayer.plan.ProtectedCondition; 
    49 import FAtiMA.deliberativeLayer.plan.Step; 
    50 import FAtiMA.exceptions.InvalidReplaceUnboundVariableException; 
    51 import FAtiMA.sensorEffector.Event; 
    52 import FAtiMA.wellFormedNames.Name; 
    53 import FAtiMA.wellFormedNames.Substitution; 
    54 import FAtiMA.wellFormedNames.SubstitutionSet; 
    55 import FAtiMA.wellFormedNames.Symbol; 
    56 import FAtiMA.wellFormedNames.Unifier; 
     39import FAtiMA.Core.ActionLibrary; 
     40import FAtiMA.Core.AgentModel; 
     41import FAtiMA.Core.conditions.Condition; 
     42import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; 
     43import FAtiMA.Core.deliberativeLayer.plan.CausalLink; 
     44import FAtiMA.Core.deliberativeLayer.plan.Effect; 
     45import FAtiMA.Core.deliberativeLayer.plan.IPlanningOperator; 
     46import FAtiMA.Core.deliberativeLayer.plan.OrderingConstraint; 
     47import FAtiMA.Core.deliberativeLayer.plan.Plan; 
     48import FAtiMA.Core.deliberativeLayer.plan.ProtectedCondition; 
     49import FAtiMA.Core.deliberativeLayer.plan.Step; 
     50import FAtiMA.Core.exceptions.InvalidReplaceUnboundVariableException; 
     51import FAtiMA.Core.sensorEffector.Event; 
     52import FAtiMA.Core.wellFormedNames.Name; 
     53import FAtiMA.Core.wellFormedNames.Substitution; 
     54import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
     55import FAtiMA.Core.wellFormedNames.Symbol; 
     56import FAtiMA.Core.wellFormedNames.Unifier; 
    5757 
    5858public class Ritual extends ActivePursuitGoal { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/culture/RitualCondition.java

    r643 r667  
    3636import org.xml.sax.Attributes; 
    3737 
    38 import FAtiMA.AgentModel; 
    39 import FAtiMA.conditions.PredicateCondition; 
    40 import FAtiMA.memory.episodicMemory.SearchKey; 
    41 import FAtiMA.wellFormedNames.Name; 
    42 import FAtiMA.wellFormedNames.Substitution; 
    43 import FAtiMA.wellFormedNames.Symbol; 
     38import FAtiMA.Core.AgentModel; 
     39import FAtiMA.Core.conditions.PredicateCondition; 
     40import FAtiMA.Core.memory.episodicMemory.SearchKey; 
     41import FAtiMA.Core.wellFormedNames.Name; 
     42import FAtiMA.Core.wellFormedNames.Substitution; 
     43import FAtiMA.Core.wellFormedNames.Symbol; 
    4444 
    4545 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/culture/SymbolTranslator.java

    r278 r667  
    33import java.util.HashMap; 
    44 
    5 import FAtiMA.exceptions.DuplicateSymbolTranslatorEntry; 
     5import FAtiMA.Core.exceptions.DuplicateSymbolTranslatorEntry; 
    66 
    77/** @author: Samuel Mascarenhas 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/emotionalIntelligence/ActionTendencyOperatorFactory.java

    r308 r667  
    11package FAtiMA.emotionalIntelligence; 
    22 
    3 import FAtiMA.AgentModel; 
    4 import FAtiMA.conditions.Condition; 
    5 import FAtiMA.conditions.EmotionCondition; 
    6 import FAtiMA.conditions.RecentEventCondition; 
    7 import FAtiMA.deliberativeLayer.plan.Effect; 
    8 import FAtiMA.deliberativeLayer.plan.Step; 
    9 import FAtiMA.emotionalState.BaseEmotion; 
    10 import FAtiMA.reactiveLayer.Action; 
    11 import FAtiMA.util.enumerables.ActionEvent; 
    12 import FAtiMA.util.enumerables.EventType; 
    13 import FAtiMA.wellFormedNames.Name; 
    14 import FAtiMA.wellFormedNames.Symbol; 
     3import FAtiMA.Core.AgentModel; 
     4import FAtiMA.Core.conditions.Condition; 
     5import FAtiMA.Core.conditions.EmotionCondition; 
     6import FAtiMA.Core.conditions.RecentEventCondition; 
     7import FAtiMA.Core.deliberativeLayer.plan.Effect; 
     8import FAtiMA.Core.deliberativeLayer.plan.Step; 
     9import FAtiMA.Core.emotionalState.BaseEmotion; 
     10import FAtiMA.Core.reactiveLayer.Action; 
     11import FAtiMA.Core.util.enumerables.ActionEvent; 
     12import FAtiMA.Core.util.enumerables.EventType; 
     13import FAtiMA.Core.wellFormedNames.Name; 
     14import FAtiMA.Core.wellFormedNames.Symbol; 
    1515 
    1616public abstract class ActionTendencyOperatorFactory { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/emotionalIntelligence/AppraisalCondition.java

    r650 r667  
    44import java.util.ListIterator; 
    55 
    6 import FAtiMA.AgentModel; 
    7 import FAtiMA.conditions.PastEventCondition; 
    8 import FAtiMA.emotionalState.EmotionalPameters; 
    9 import FAtiMA.memory.episodicMemory.ActionDetail; 
    10 import FAtiMA.util.Constants; 
    11 import FAtiMA.wellFormedNames.Name; 
    12 import FAtiMA.wellFormedNames.Substitution; 
    13 import FAtiMA.wellFormedNames.SubstitutionSet; 
    14 import FAtiMA.wellFormedNames.Symbol; 
     6import FAtiMA.Core.AgentModel; 
     7import FAtiMA.Core.conditions.PastEventCondition; 
     8import FAtiMA.Core.emotionalState.EmotionalPameters; 
     9import FAtiMA.Core.memory.episodicMemory.ActionDetail; 
     10import FAtiMA.Core.util.Constants; 
     11import FAtiMA.Core.wellFormedNames.Name; 
     12import FAtiMA.Core.wellFormedNames.Substitution; 
     13import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
     14import FAtiMA.Core.wellFormedNames.Symbol; 
    1515 
    1616public class AppraisalCondition extends PastEventCondition { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/emotionalIntelligence/OCCAppraisalRules.java

    r650 r667  
    33import java.util.ArrayList; 
    44 
    5 import FAtiMA.AgentModel; 
    6 import FAtiMA.conditions.EmotionCondition; 
    7 import FAtiMA.conditions.NewEventCondition; 
     5import FAtiMA.Core.AgentModel; 
     6import FAtiMA.Core.conditions.EmotionCondition; 
     7import FAtiMA.Core.conditions.NewEventCondition; 
     8import FAtiMA.Core.deliberativeLayer.plan.Effect; 
     9import FAtiMA.Core.deliberativeLayer.plan.Step; 
     10import FAtiMA.Core.emotionalState.EmotionDisposition; 
     11import FAtiMA.Core.util.enumerables.ActionEvent; 
     12import FAtiMA.Core.util.enumerables.EmotionType; 
     13import FAtiMA.Core.util.enumerables.EventType; 
     14import FAtiMA.Core.wellFormedNames.Name; 
     15import FAtiMA.Core.wellFormedNames.Symbol; 
    816 
    9 import FAtiMA.deliberativeLayer.plan.Effect; 
    10 import FAtiMA.deliberativeLayer.plan.Step; 
    11 import FAtiMA.emotionalState.EmotionDisposition; 
    12 import FAtiMA.util.enumerables.ActionEvent; 
    13 import FAtiMA.util.enumerables.EmotionType; 
    14 import FAtiMA.util.enumerables.EventType; 
    15 import FAtiMA.wellFormedNames.Name; 
    16 import FAtiMA.wellFormedNames.Symbol; 
    1717 
    1818public abstract class OCCAppraisalRules { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/motivationalSystem/DrivesDisplay.java

    r643 r667  
    99import javax.swing.JProgressBar; 
    1010 
    11 import FAtiMA.AgentModel; 
    12 import FAtiMA.util.Constants; 
     11import FAtiMA.Core.AgentModel; 
     12import FAtiMA.Core.util.Constants; 
    1313 
    1414public class DrivesDisplay { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/motivationalSystem/MotivationalState.java

    r666 r667  
    1111import java.util.ListIterator; 
    1212 
    13 import FAtiMA.AgentCore; 
    14 import FAtiMA.AgentModel; 
    15 import FAtiMA.AgentSimulationTime; 
    16 import FAtiMA.IComponent; 
    17 import FAtiMA.Display.AgentDisplayPanel; 
     13import FAtiMA.Core.AgentCore; 
     14import FAtiMA.Core.AgentModel; 
     15import FAtiMA.Core.AgentSimulationTime; 
     16import FAtiMA.Core.IComponent; 
     17import FAtiMA.Core.Display.AgentDisplayPanel; 
     18import FAtiMA.Core.deliberativeLayer.IActionFailureStrategy; 
     19import FAtiMA.Core.deliberativeLayer.IExpectedUtilityStrategy; 
     20import FAtiMA.Core.deliberativeLayer.IGoalFailureStrategy; 
     21import FAtiMA.Core.deliberativeLayer.IGoalSuccessStrategy; 
     22import FAtiMA.Core.deliberativeLayer.IProbabilityStrategy; 
     23import FAtiMA.Core.deliberativeLayer.IUtilityForTargetStrategy; 
     24import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; 
     25import FAtiMA.Core.deliberativeLayer.goals.Goal; 
     26import FAtiMA.Core.deliberativeLayer.plan.EffectOnDrive; 
     27import FAtiMA.Core.deliberativeLayer.plan.IPlanningOperator; 
     28import FAtiMA.Core.deliberativeLayer.plan.Step; 
     29import FAtiMA.Core.emotionalState.ActiveEmotion; 
     30import FAtiMA.Core.emotionalState.Appraisal; 
     31import FAtiMA.Core.emotionalState.AppraisalStructure; 
     32import FAtiMA.Core.emotionalState.BaseEmotion; 
     33import FAtiMA.Core.emotionalState.EmotionalState; 
     34import FAtiMA.Core.sensorEffector.Event; 
     35import FAtiMA.Core.util.AgentLogger; 
     36import FAtiMA.Core.util.Constants; 
     37import FAtiMA.Core.wellFormedNames.Name; 
     38import FAtiMA.Core.wellFormedNames.Substitution; 
     39import FAtiMA.Core.wellFormedNames.Symbol; 
     40import FAtiMA.Core.wellFormedNames.Unifier; 
    1841import FAtiMA.ToM.ModelOfOther; 
    19 import FAtiMA.deliberativeLayer.IActionFailureStrategy; 
    20 import FAtiMA.deliberativeLayer.IExpectedUtilityStrategy; 
    21 import FAtiMA.deliberativeLayer.IGoalFailureStrategy; 
    22 import FAtiMA.deliberativeLayer.IGoalSuccessStrategy; 
    23 import FAtiMA.deliberativeLayer.IProbabilityStrategy; 
    24 import FAtiMA.deliberativeLayer.IUtilityForTargetStrategy; 
    25 import FAtiMA.deliberativeLayer.goals.ActivePursuitGoal; 
    26 import FAtiMA.deliberativeLayer.goals.Goal; 
    27 import FAtiMA.deliberativeLayer.plan.EffectOnDrive; 
    28 import FAtiMA.deliberativeLayer.plan.IPlanningOperator; 
    29 import FAtiMA.deliberativeLayer.plan.Step; 
    30 import FAtiMA.emotionalState.ActiveEmotion; 
    31 import FAtiMA.emotionalState.Appraisal; 
    32 import FAtiMA.emotionalState.AppraisalStructure; 
    33 import FAtiMA.emotionalState.BaseEmotion; 
    34 import FAtiMA.emotionalState.EmotionalState; 
    35 import FAtiMA.sensorEffector.Event; 
    36 import FAtiMA.util.AgentLogger; 
    37 import FAtiMA.util.Constants; 
    38 import FAtiMA.wellFormedNames.Name; 
    39 import FAtiMA.wellFormedNames.Substitution; 
    40 import FAtiMA.wellFormedNames.Symbol; 
    41 import FAtiMA.wellFormedNames.Unifier; 
    4242 
    4343/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/motivationalSystem/Motivator.java

    r643 r667  
    88import java.io.Serializable; 
    99 
    10 import FAtiMA.AgentSimulationTime; 
     10import FAtiMA.Core.AgentSimulationTime; 
    1111 
    1212/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/motivationalSystem/MotivatorCondition.java

    r643 r667  
    55import org.xml.sax.Attributes; 
    66 
    7 import FAtiMA.AgentModel; 
    8 import FAtiMA.conditions.Condition; 
    9 import FAtiMA.util.AgentLogger; 
    10 import FAtiMA.wellFormedNames.Name; 
    11 import FAtiMA.wellFormedNames.Substitution; 
    12 import FAtiMA.wellFormedNames.SubstitutionSet; 
    13 import FAtiMA.wellFormedNames.Symbol; 
     7import FAtiMA.Core.AgentModel; 
     8import FAtiMA.Core.conditions.Condition; 
     9import FAtiMA.Core.util.AgentLogger; 
     10import FAtiMA.Core.wellFormedNames.Name; 
     11import FAtiMA.Core.wellFormedNames.Substitution; 
     12import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
     13import FAtiMA.Core.wellFormedNames.Symbol; 
    1414 
    1515public class MotivatorCondition extends Condition { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/motivationalSystem/NeedsPanel.java

    r651 r667  
    99import javax.swing.JScrollPane; 
    1010 
    11 import FAtiMA.AgentCore; 
    12 import FAtiMA.AgentModel; 
    13 import FAtiMA.Display.AgentDisplayPanel; 
    14 import FAtiMA.util.Constants; 
     11import FAtiMA.Core.AgentCore; 
     12import FAtiMA.Core.AgentModel; 
     13import FAtiMA.Core.Display.AgentDisplayPanel; 
     14import FAtiMA.Core.util.Constants; 
    1515 
    1616public class NeedsPanel extends AgentDisplayPanel { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/socialRelations/LikeCondition.java

    r643 r667  
    66 
    77 
    8 import FAtiMA.AgentModel; 
    9 import FAtiMA.conditions.Condition; 
    10 import FAtiMA.conditions.Context; 
    11 import FAtiMA.exceptions.ContextParsingException; 
    12 import FAtiMA.exceptions.InvalidEmotionTypeException; 
    13 import FAtiMA.util.Constants; 
    14 import FAtiMA.wellFormedNames.Name; 
    15 import FAtiMA.wellFormedNames.Substitution; 
    16 import FAtiMA.wellFormedNames.SubstitutionSet; 
    17 import FAtiMA.wellFormedNames.Symbol; 
     8import FAtiMA.Core.AgentModel; 
     9import FAtiMA.Core.conditions.Condition; 
     10import FAtiMA.Core.conditions.Context; 
     11import FAtiMA.Core.exceptions.ContextParsingException; 
     12import FAtiMA.Core.exceptions.InvalidEmotionTypeException; 
     13import FAtiMA.Core.util.Constants; 
     14import FAtiMA.Core.wellFormedNames.Name; 
     15import FAtiMA.Core.wellFormedNames.Substitution; 
     16import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
     17import FAtiMA.Core.wellFormedNames.Symbol; 
    1818 
    1919/** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/socialRelations/LikeRelation.java

    r278 r667  
    44import java.util.ListIterator; 
    55 
    6 import FAtiMA.memory.Memory; 
    7 import FAtiMA.util.enumerables.RelationType; 
    8 import FAtiMA.wellFormedNames.Name; 
    9 import FAtiMA.wellFormedNames.Substitution; 
    10 import FAtiMA.wellFormedNames.SubstitutionSet; 
     6import FAtiMA.Core.memory.Memory; 
     7import FAtiMA.Core.util.enumerables.RelationType; 
     8import FAtiMA.Core.wellFormedNames.Name; 
     9import FAtiMA.Core.wellFormedNames.Substitution; 
     10import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
    1111 
    1212public class LikeRelation extends Relation { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/socialRelations/Relation.java

    r278 r667  
    11package FAtiMA.socialRelations; 
    22 
    3 import FAtiMA.memory.Memory; 
     3import FAtiMA.Core.memory.Memory; 
    44 
    55public abstract class Relation { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/socialRelations/RelationDisplay.java

    r643 r667  
    3737import javax.swing.JProgressBar; 
    3838 
    39 import FAtiMA.memory.Memory; 
    40 import FAtiMA.util.enumerables.RelationType; 
     39import FAtiMA.Core.memory.Memory; 
     40import FAtiMA.Core.util.enumerables.RelationType; 
    4141 
    4242 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/socialRelations/RespectRelation.java

    r278 r667  
    44import java.util.ListIterator; 
    55 
    6 import FAtiMA.memory.Memory; 
    7 import FAtiMA.util.enumerables.RelationType; 
    8 import FAtiMA.wellFormedNames.Name; 
    9 import FAtiMA.wellFormedNames.Substitution; 
    10 import FAtiMA.wellFormedNames.SubstitutionSet; 
     6import FAtiMA.Core.memory.Memory; 
     7import FAtiMA.Core.util.enumerables.RelationType; 
     8import FAtiMA.Core.wellFormedNames.Name; 
     9import FAtiMA.Core.wellFormedNames.Substitution; 
     10import FAtiMA.Core.wellFormedNames.SubstitutionSet; 
    1111 
    1212public class RespectRelation extends Relation{ 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/socialRelations/SocialRelationsComponent.java

    r645 r667  
    11package FAtiMA.socialRelations; 
    22 
    3 import FAtiMA.AgentCore; 
    4 import FAtiMA.AgentModel; 
    5 import FAtiMA.IComponent; 
    6 import FAtiMA.Display.AgentDisplayPanel; 
    7 import FAtiMA.emotionalState.ActiveEmotion; 
    8 import FAtiMA.emotionalState.AppraisalStructure; 
    9 import FAtiMA.memory.Memory; 
    10 import FAtiMA.reactiveLayer.Reaction; 
    11 import FAtiMA.sensorEffector.Event; 
    12 import FAtiMA.util.Constants; 
    13 import FAtiMA.util.enumerables.EmotionType; 
    14 import FAtiMA.wellFormedNames.Name; 
     3import FAtiMA.Core.AgentCore; 
     4import FAtiMA.Core.AgentModel; 
     5import FAtiMA.Core.IComponent; 
     6import FAtiMA.Core.Display.AgentDisplayPanel; 
     7import FAtiMA.Core.emotionalState.ActiveEmotion; 
     8import FAtiMA.Core.emotionalState.AppraisalStructure; 
     9import FAtiMA.Core.memory.Memory; 
     10import FAtiMA.Core.reactiveLayer.Reaction; 
     11import FAtiMA.Core.sensorEffector.Event; 
     12import FAtiMA.Core.util.Constants; 
     13import FAtiMA.Core.util.enumerables.EmotionType; 
     14import FAtiMA.Core.wellFormedNames.Name; 
    1515 
    1616public class SocialRelationsComponent implements IComponent { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/socialRelations/SocialRelationsPanel.java

    r651 r667  
    1010import javax.swing.JScrollPane; 
    1111 
    12 import FAtiMA.AgentCore; 
    13 import FAtiMA.AgentModel; 
    14 import FAtiMA.Display.AgentDisplayPanel; 
    15 import FAtiMA.util.Constants; 
     12import FAtiMA.Core.AgentCore; 
     13import FAtiMA.Core.AgentModel; 
     14import FAtiMA.Core.Display.AgentDisplayPanel; 
     15import FAtiMA.Core.util.Constants; 
    1616 
    1717public class SocialRelationsPanel extends AgentDisplayPanel { 
Note: See TracChangeset for help on using the changeset viewer.