Project structure improvement.

Author: patham9

nars_core/nars/control/ConceptProcessing.java

@@ -7,12 +7,12 @@
 import nars.entity.*;
 import nars.inference.TemporalRules;
 import nars.inference.TruthFunctions;
-import nars.io.handlers.OutputHandler;
+import nars.io.events.OutputHandler;
 import nars.io.Symbols;
 import nars.language.*;
 import nars.operator.Operation;
 import nars.plugin.mental.InternalExperience;
-import nars.util.Events;
+import nars.io.events.Events;
 import nars.storage.LevelBag;
 
 import static nars.inference.LocalRules.revisible;

nars_core/nars/control/DerivationContext.java

@@ -6,11 +6,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import nars.util.Events;
+import nars.io.events.Events;
 import nars.storage.Memory;
 import nars.main.NAR;
 import nars.main.Parameters;
-import nars.util.Plugin;
+import nars.plugin.Plugin;
 import nars.entity.BudgetValue;
 import nars.entity.Concept;
 import nars.entity.Sentence;

nars_core/nars/control/GeneralInferenceControl.java

@@ -6,7 +6,7 @@
 
 import nars.main.Parameters;
 import nars.entity.Concept;
-import nars.util.Events;
+import nars.io.events.Events;
 import nars.entity.Task;
 import nars.entity.TermLink;
 import nars.inference.BudgetFunctions;

nars_core/nars/control/TemporalInferenceControl.java

@@ -20,7 +20,7 @@
 import nars.operator.Operation;
 import nars.storage.LevelBag;
 import nars.storage.Memory;
-import nars.util.Events;
+import nars.io.events.Events;
 
 /**
  *

nars_core/nars/entity/BudgetValue.java

@@ -25,7 +25,7 @@
 import static nars.main.Parameters.TRUTH_EPSILON;
 import nars.inference.BudgetFunctions;
 import nars.io.Symbols;
-import nars.util.Texts;
+import nars.io.Texts;
 import static nars.inference.UtilityFunctions.and;
 import static nars.inference.UtilityFunctions.aveGeo;
 import static nars.inference.UtilityFunctions.or;

nars_core/nars/entity/Concept.java

@@ -26,11 +26,11 @@
 import java.util.List;
 
 import nars.control.ConceptProcessing;
-import nars.util.Events.BeliefSelect;
-import nars.util.Events.TaskLinkAdd;
-import nars.util.Events.TaskLinkRemove;
-import nars.util.Events.TermLinkAdd;
-import nars.util.Events.TermLinkRemove;
+import nars.io.events.Events.BeliefSelect;
+import nars.io.events.Events.TaskLinkAdd;
+import nars.io.events.Events.TaskLinkRemove;
+import nars.io.events.Events.TermLinkAdd;
+import nars.io.events.Events.TermLinkRemove;
 import nars.storage.Memory;
 import nars.main.Shell;
 import nars.main.Parameters;

nars_core/nars/entity/Sentence.java

@@ -32,7 +32,7 @@
 import nars.inference.TruthFunctions;
 import nars.inference.TruthFunctions.EternalizedTruthValue;
 import nars.io.Symbols;
-import nars.util.Texts;
+import nars.io.Texts;
 import nars.language.CompoundTerm;
 import nars.language.Conjunction;
 import nars.language.Equivalence;

nars_core/nars/entity/TruthValue.java

@@ -24,7 +24,7 @@
 import nars.main.Parameters;
 import static nars.main.Parameters.TRUTH_EPSILON;
 import nars.io.Symbols;
-import nars.util.Texts;
+import nars.io.Texts;
 import nars.language.Term;
 
 

nars_core/nars/inference/LocalRules.java

@@ -22,8 +22,8 @@
 
 import java.util.ArrayList;
 import nars.main.Parameters;
-import nars.util.Events.Answer;
-import nars.util.Events.Unsolved;
+import nars.io.events.Events.Answer;
+import nars.io.events.Events.Unsolved;
 import nars.storage.Memory;
 import nars.control.DerivationContext;
 import nars.entity.BudgetValue;
@@ -37,7 +37,7 @@
 import static nars.inference.TemporalRules.matchingOrder;
 import static nars.inference.TemporalRules.reverseOrder;
 import static nars.inference.TruthFunctions.temporalProjection;
-import nars.io.handlers.OutputHandler;
+import nars.io.events.OutputHandler;
 import nars.io.Symbols;
 import nars.language.CompoundTerm;
 import static nars.language.CompoundTerm.extractIntervals;

nars_core/nars/inference/RuleTables.java

@@ -20,7 +20,7 @@
  */
 package nars.inference;
 
-import nars.util.Events;
+import nars.io.events.Events;
 import nars.storage.Memory;
 import nars.main.Parameters;
 import nars.control.DerivationContext;

nars_core/nars/io/Narsese.java

@@ -12,7 +12,6 @@
 import nars.entity.Stamp;
 import nars.entity.Task;
 import nars.entity.TruthValue;
-import nars.util.Texts;
 import static nars.inference.BudgetFunctions.truthToQuality;
 import static nars.io.Symbols.ARGUMENT_SEPARATOR;
 import static nars.io.Symbols.BUDGET_VALUE_MARK;

nars_core/nars/io/Symbols.java

@@ -22,9 +22,9 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import nars.io.handlers.OutputHandler.ERR;
-import nars.io.handlers.OutputHandler.IN;
-import nars.io.handlers.OutputHandler.OUT;
+import nars.io.events.OutputHandler.ERR;
+import nars.io.events.OutputHandler.IN;
+import nars.io.events.OutputHandler.OUT;
 
 
 public class Symbols {

nars_core/nars/util/Texts.java renamed to nars_core/nars/io/Texts.java

@@ -1,4 +1,4 @@
-package nars.util;
+package nars.io;
 
 import nars.io.Symbols;
 import java.nio.CharBuffer;

nars_core/nars/io/handlers/AnswerHandler.java renamed to nars_core/nars/io/events/AnswerHandler.java

@@ -2,10 +2,10 @@
  * Here comes the text of your license
  * Each line should be prefixed with  * 
  */
-package nars.io.handlers;
+package nars.io.events;
 
-import nars.util.EventEmitter.EventObserver;
-import nars.util.Events.Answer;
+import nars.io.events.EventEmitter.EventObserver;
+import nars.io.events.Events.Answer;
 import nars.main.NAR;
 import nars.entity.Sentence;
 import nars.entity.Task;

nars_core/nars/util/EventEmitter.java renamed to nars_core/nars/io/events/EventEmitter.java

@@ -1,5 +1,5 @@
 
-package nars.util;
+package nars.io.events;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;

nars_core/nars/io/handlers/EventHandler.java renamed to nars_core/nars/io/events/EventHandler.java

@@ -1,7 +1,6 @@
-package nars.io.handlers;
+package nars.io.events;
 
 import nars.main.NAR;
-import nars.util.EventEmitter;
 
 /**
  *