aimacode · sfsharapov · Jan 5, 2022
diff --git a/aima-csharp.sln b/aima-csharp.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32002.185
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aima-csharp", "aima-csharp\aima-csharp.csproj", "{125F53D5-1CCF-4DAF-82FE-4324686CF417}"
 EndProject
@@ -19,4 +19,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {32CF737F-F65E-4EBE-9736-D55E24DF46C3}
+	EndGlobalSection
 EndGlobal
diff --git a/aima-csharp/App.config b/aima-csharp/App.config
diff --git a/aima-csharp/Program.cs b/aima-csharp/Program.cs
@@ -1,15 +1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace aima_csharp
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-        }
-    }
-}
+
diff --git a/aima-csharp/Properties/AssemblyInfo.cs b/aima-csharp/Properties/AssemblyInfo.cs
diff --git a/aima-csharp/agent/Action.cs b/aima-csharp/agent/Action.cs
@@ -1,14 +1,11 @@
-using System;
-using System.Collections.Generic;
-
 namespace aima.core.agent
 {
     /**
      * Describes an Action that can or has been taken by an Agent via one of its Actuators. 
      *
      * @author Ciaran O'Reilly
      */
-     public interface Action
+    public interface Action
      {
          /**
 	  * Indicates whether or not this Action is a 'No Operation'.<br>

diff --git a/aima-csharp/agent/Agent.cs b/aima-csharp/agent/Agent.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections;
-
 namespace aima.core.agent
 {
     /**

diff --git a/aima-csharp/agent/AgentProgram.cs b/aima-csharp/agent/AgentProgram.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace aima.core.agent
 {
     /**

diff --git a/aima-csharp/agent/Environment.cs b/aima-csharp/agent/Environment.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace aima.core.agent
 {
     /**

diff --git a/aima-csharp/agent/EnvironmentObject.cs b/aima-csharp/agent/EnvironmentObject.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace aima.core.agent
 {
     /**

diff --git a/aima-csharp/agent/EnvironmentState.cs b/aima-csharp/agent/EnvironmentState.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace aima.core.agent
 {
     /**

diff --git a/aima-csharp/agent/EnvironmentView.cs b/aima-csharp/agent/EnvironmentView.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace aima.core.agent
 {
     /**
@@ -11,7 +8,7 @@ namespace aima.core.agent
      * @author Ciaran O'Reilly
      * @author Mike Stampone
      */
-     public interface EnvironmentView
+    public interface EnvironmentView
     {
         /**
 	 * A simple notification message from the Environment, from one of its
@@ -45,6 +42,6 @@ public interface EnvironmentView
 	 *            the EnvironmentState that resulted from the Agent's Action on
 	 *            the Environment.
 	 */
-        void agentActed(Agent agent, Action action, EnvironmentState resultingState);
+        void agentActed(Agent agent, agent.Action action, EnvironmentState resultingState);
     }
 }
diff --git a/aima-csharp/agent/EnvironmentViewNotifier.cs b/aima-csharp/agent/EnvironmentViewNotifier.cs
@@ -1,13 +1,10 @@
-using System;
-using System.Collections.Generic;
-
 namespace aima.core.agent
 {
     /**
      * @author Ciaran O'Reilly
      * 
      */
-     public interface EnvironmentViewNotifier
+    public interface EnvironmentViewNotifier
     {
         /**
 	 * A simple notification message, to be forwarded to an Environment's

diff --git a/aima-csharp/agent/Model.cs b/aima-csharp/agent/Model.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace aima.core.agent
 {
     /**
@@ -12,7 +9,7 @@ namespace aima.core.agent
      *
      * @author Ciaran O'Reilly
      */
-     public interface Model
+    public interface Model
     {
 
     }

diff --git a/aima-csharp/agent/Percept.cs b/aima-csharp/agent/Percept.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-
 namespace aima.core.agent
-{    
+{
     /**
      * Artificial Intelligence A Modern Approach (3rd Edition): pg 34.<br>
      * We use the term percept to refer the agent's perceptual inputs at any given instant.

diff --git a/aima-csharp/agent/State.cs b/aima-csharp/agent/State.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace aima.core.agent
 {
     /**

diff --git a/aima-csharp/agent/impl/AbstractAgent.cs b/aima-csharp/agent/impl/AbstractAgent.cs
@@ -1,14 +1,11 @@
-using System;
-using aima.core.agent;
-
 namespace aima.core.agent.impl
 {
     /**
      * @author Ravi Mohan
      * @author Ciaran O'Reilly
      * @author Mike Stampone
      */
-     public abstract class AbstractAgent : Agent
+    public abstract class AbstractAgent : Agent
     {
         protected AgentProgram program;
         private bool alive = true;

diff --git a/aima-csharp/agent/impl/AbstractEnvironment.cs b/aima-csharp/agent/impl/AbstractEnvironment.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using aima.core.agent;
 using aima.core.util;
 
 namespace aima.core.agent.impl
@@ -27,7 +24,7 @@ public abstract class AbstractEnvironment : Environment, EnvironmentViewNotifier
         // Methods to be implemented by subclasses.
         public abstract EnvironmentState getCurrentState();
 
-        public abstract EnvironmentState executeAction(Agent agent, Action action);
+        public abstract EnvironmentState executeAction(Agent agent, agent.Action action);
 
         public abstract Percept getPerceptSeenBy(Agent anAgent);
         /**
@@ -176,7 +173,7 @@ protected void updateEnvironmentViewsAgentAdded(Agent agent)
             }
         }
 
-        protected void updateEnvironmentViewsAgentActed(Agent agent, Action action,
+        protected void updateEnvironmentViewsAgentActed(Agent agent, agent.Action action,
                 EnvironmentState state)
         {
             foreach (EnvironmentView view in views)

diff --git a/aima-csharp/agent/impl/DynamicAction.cs b/aima-csharp/agent/impl/DynamicAction.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using aima.core.agent;
-
 namespace aima.core.agent.impl
 {
     /**

diff --git a/aima-csharp/agent/impl/DynamicEnvironmentState.cs b/aima-csharp/agent/impl/DynamicEnvironmentState.cs
@@ -1,14 +1,10 @@
-using System;
-using System.Collections.Generic;
-using aima.core.agent;
-
 namespace aima.core.agent.impl
 {
     /**
      * @author Ravi Mohan
      * @author Ciaran O'Reilly
      */
-     public class DynamicEnvironmentState : ObjectWithDynamicAttributes, EnvironmentState
+    public class DynamicEnvironmentState : ObjectWithDynamicAttributes, EnvironmentState
     {
         public DynamicEnvironmentState()
         {

diff --git a/aima-csharp/agent/impl/DynamicPercept.cs b/aima-csharp/agent/impl/DynamicPercept.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using aima.core.agent;
 using System.Diagnostics;
 
 namespace aima.core.agent.impl

diff --git a/aima-csharp/agent/impl/DynamicState.cs b/aima-csharp/agent/impl/DynamicState.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using aima.core.agent;
-
 namespace aima.core.agent.impl
 {
     /**

diff --git a/aima-csharp/agent/impl/NoOpAction.cs b/aima-csharp/agent/impl/NoOpAction.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
 namespace aima.core.agent.impl
 {
     public class NoOpAction : DynamicAction

diff --git a/aima-csharp/agent/impl/ObjectWithDynamicAttributes.cs b/aima-csharp/agent/impl/ObjectWithDynamicAttributes.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Text;
 using System.Diagnostics;
 
@@ -9,7 +7,7 @@ namespace aima.core.agent.impl
      * @author Ravi Mohan
      * @author Ciaran O'Reilly
      */
-     public abstract class ObjectWithDynamicAttributes
+    public abstract class ObjectWithDynamicAttributes
     {
         private Dictionary<Object, Object> attributes = new Dictionary<Object, Object>();
 

diff --git a/aima-csharp/agent/impl/SimpleEnvironmentView.cs b/aima-csharp/agent/impl/SimpleEnvironmentView.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using aima.core.agent;
-
 namespace aima.core.agent.impl
 {
     /**
@@ -12,7 +8,7 @@ namespace aima.core.agent.impl
      */
     public class SimpleEnvironmentView : EnvironmentView
     {
-        public void agentActed(Agent agent, Action action, EnvironmentState resultingState)
+        public void agentActed(Agent agent, agent.Action action, EnvironmentState resultingState)
         {
             System.Console.WriteLine("Agent acted: " + action.ToString());
         }

diff --git a/aima-csharp/agent/impl/aprog/ModelBasedReflexAgentProgram.cs b/aima-csharp/agent/impl/aprog/ModelBasedReflexAgentProgram.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using aima.core.agent;
 using aima.core.agent.impl.aprog.simplerule;
 
 namespace aima.core.agent.impl.aprog
@@ -16,7 +14,7 @@ namespace aima.core.agent.impl.aprog
  *               rules, a set of condition-action rules
  *               action, the most recent action, initially none
  *               
- *   state  <- UPDATE-STATE(state, action, percept, model)
+ *   state  <- UPDATE-STATE(state, agent.Action, percept, model)
  *   rule   <- RULE-MATCH(state, rules)
  *   action <- rule.ACTION
  *   return action
@@ -91,7 +89,7 @@ public void setRules(HashSet<Rule> ruleSet)
         // function MODEL-BASED-REFLEX-AGENT(percept) returns an action
         public Action execute(Percept percept)
         {
-            // state <- UPDATE-STATE(state, action, percept, model)
+            // state <- UPDATE-STATE(state, agent.Action, percept, model)
             state = updateState(state, action, percept, model);
             // rule <- RULE-MATCH(state, rules)
             Rule rule = ruleMatch(state, rules);
@@ -111,7 +109,7 @@ public Action execute(Percept percept)
 	 */
         protected abstract void init();
 
-        protected abstract DynamicState updateState(DynamicState state, Action action, Percept percept, Model model);
+        protected abstract DynamicState updateState(DynamicState state, agent.Action action, Percept percept, Model model);
 
         protected Rule ruleMatch(DynamicState state, HashSet<Rule> rules)
         {

diff --git a/aima-csharp/agent/impl/aprog/SimpleReflexAgentProgram.cs b/aima-csharp/agent/impl/aprog/SimpleReflexAgentProgram.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using aima.core.agent;
-using aima.core.agent.impl;
 using aima.core.agent.impl.aprog.simplerule;
 
 namespace aima.core.agent.impl.aprog
@@ -27,7 +23,7 @@ namespace aima.core.agent.impl.aprog
      * @author Mike Stampone
      * 
      */
-     public class SimpleReflexAgentProgram : AgentProgram
+    public class SimpleReflexAgentProgram : AgentProgram
     {
         // persistent: rules, a set of condition-action rules
         private HashSet<Rule> rules;

diff --git a/aima-csharp/agent/impl/aprog/TableDrivenAgentProgram.cs b/aima-csharp/agent/impl/aprog/TableDrivenAgentProgram.cs
@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using aima.core.agent;
-using aima.core.agent.impl;
 using aima.core.util;
 
 namespace aima.core.agent.impl.aprog

diff --git a/aima-csharp/agent/impl/aprog/simplerule/ANDCondition.cs b/aima-csharp/agent/impl/aprog/simplerule/ANDCondition.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
 using System.Text;
 using System.Diagnostics;
-using aima.core.agent.impl;
 
 namespace aima.core.agent.impl.aprog.simplerule
 {