From 8e96a2fe8793913ee3c45822f7e22e50177c7d7a Mon Sep 17 00:00:00 2001 From: Sardor <23080892+sfsharapov@users.noreply.github.com> Date: Wed, 5 Jan 2022 17:57:27 +0700 Subject: [PATCH] Migrated to .NET 6 LTS version --- aima-csharp.sln | 7 +- aima-csharp/App.config | 6 - aima-csharp/Program.cs | 16 +- aima-csharp/Properties/AssemblyInfo.cs | 36 --- aima-csharp/agent/Action.cs | 5 +- aima-csharp/agent/Agent.cs | 3 - aima-csharp/agent/AgentProgram.cs | 3 - aima-csharp/agent/Environment.cs | 3 - aima-csharp/agent/EnvironmentObject.cs | 3 - aima-csharp/agent/EnvironmentState.cs | 3 - aima-csharp/agent/EnvironmentView.cs | 7 +- aima-csharp/agent/EnvironmentViewNotifier.cs | 5 +- aima-csharp/agent/Model.cs | 5 +- aima-csharp/agent/Percept.cs | 5 +- aima-csharp/agent/State.cs | 3 - aima-csharp/agent/impl/AbstractAgent.cs | 5 +- aima-csharp/agent/impl/AbstractEnvironment.cs | 7 +- aima-csharp/agent/impl/DynamicAction.cs | 4 - .../agent/impl/DynamicEnvironmentState.cs | 6 +- aima-csharp/agent/impl/DynamicPercept.cs | 3 - aima-csharp/agent/impl/DynamicState.cs | 4 - aima-csharp/agent/impl/NoOpAction.cs | 3 - .../agent/impl/ObjectWithDynamicAttributes.cs | 4 +- .../agent/impl/SimpleEnvironmentView.cs | 6 +- .../aprog/ModelBasedReflexAgentProgram.cs | 8 +- .../impl/aprog/SimpleReflexAgentProgram.cs | 6 +- .../impl/aprog/TableDrivenAgentProgram.cs | 3 - .../impl/aprog/simplerule/ANDCondition.cs | 3 - .../agent/impl/aprog/simplerule/Condition.cs | 6 +- .../impl/aprog/simplerule/EQUALCondition.cs | 5 +- .../impl/aprog/simplerule/NOTCondition.cs | 3 - .../impl/aprog/simplerule/ORCondition.cs | 3 - .../agent/impl/aprog/simplerule/Rule.cs | 5 +- aima-csharp/aima-csharp.csproj | 275 +----------------- aima-csharp/environment/cellworld/Cell.cs | 2 - .../environment/cellworld/CellWorld.cs | 2 - .../environment/cellworld/CellWorldAction.cs | 3 +- .../environment/cellworld/CellWorldFactory.cs | 5 +- .../BidirectionalEightPuzzleProblem.cs | 1 - .../eightpuzzle/EightPuzzleBoard.cs | 3 - .../eightpuzzle/EightPuzzleFunctionFactory.cs | 8 +- .../eightpuzzle/EightPuzzleGoalTest.cs | 2 - .../eightpuzzle/ManhattanHeuristicFunction.cs | 2 - .../MisplacedTilleHeuristicFunction.cs | 2 - .../map/AdaptableHeuristicFunction.cs | 4 - .../map/BidirectionalMapProblem.cs | 2 - .../environment/map/DynAttributeNames.cs | 2 - aima-csharp/environment/map/ExtendableMap.cs | 2 - aima-csharp/environment/map/Map.cs | 2 - aima-csharp/environment/map/MapAgent.cs | 2 - aima-csharp/environment/map/MapEnvironment.cs | 3 +- .../environment/map/MapEnvironmentState.cs | 1 - .../environment/map/MapFunctionFactory.cs | 8 +- .../environment/map/MapStepCostFunction.cs | 3 +- aima-csharp/environment/map/MoveToAction.cs | 4 +- aima-csharp/environment/map/Scenario.cs | 2 - .../map/SimplifiedRoadMapOfAustralia.cs | 3 - .../map/SimplifiedRoadMapOfPartOfRomania.cs | 3 - .../StraightLineDistanceHeuristicFunction.cs | 1 - .../environment/wumpusworld/AgentPercept.cs | 1 - .../environment/wumpusworld/AgentPosition.cs | 4 +- .../wumpusworld/ManhattanHeuristicFunction.cs | 2 - aima-csharp/environment/wumpusworld/Room.cs | 2 - aima-csharp/logic/common/Lexer.cs | 4 - aima-csharp/logic/common/LexerException.cs | 3 - aima-csharp/logic/common/LogicTokenTypes.cs | 3 - aima-csharp/logic/common/Parser.cs | 4 - aima-csharp/logic/common/ParserException.cs | 3 - aima-csharp/logic/common/Token.cs | 3 - aima-csharp/logic/fol/CNFConverter.cs | 4 +- aima-csharp/logic/fol/Connectors.cs | 2 - aima-csharp/logic/fol/PredicateCollector.cs | 2 - aima-csharp/logic/fol/Quantifiers.cs | 2 - aima-csharp/logic/fol/StandardizeApart.cs | 2 - .../logic/fol/StandardizeApartInPlace.cs | 2 - .../logic/fol/StandardizeApartIndexical.cs | 2 - .../fol/StandardizeApartIndexicalFactory.cs | 2 - .../logic/fol/StandardizeApartResult.cs | 2 - aima-csharp/logic/fol/SubstVisitor.cs | 2 - .../logic/fol/SubsumptionElimination.cs | 2 - aima-csharp/logic/fol/Unifier.cs | 3 - aima-csharp/logic/fol/VariableCollector.cs | 2 - aima-csharp/logic/fol/domain/DomainFactory.cs | 2 - aima-csharp/logic/fol/domain/FOLDomain.cs | 4 - .../FOLDomainAnswerLiteralAddedEvent.cs | 2 - .../logic/fol/domain/FOLDomainEvent.cs | 2 - .../logic/fol/domain/FOLDomainListener.cs | 2 - .../FOLDomainSkolemConstantAddedEvent.cs | 2 - .../FOLDomainSkolemFunctionAddedEvent.cs | 2 - .../logic/fol/inference/AbstractModulation.cs | 3 - .../logic/fol/inference/Demodulation.cs | 3 - aima-csharp/logic/fol/inference/FOLBCAsk.cs | 3 - aima-csharp/logic/fol/inference/FOLFCAsk.cs | 2 - .../fol/inference/FOLModelElimination.cs | 3 - .../inference/FOLOTTERLikeTheoremProver.cs | 4 - .../logic/fol/inference/FOLTFMResolution.cs | 3 - .../logic/fol/inference/InferenceProcedure.cs | 2 - .../logic/fol/inference/InferenceResult.cs | 2 - .../fol/inference/InferenceResultPrinter.cs | 2 - .../logic/fol/inference/Paramodulation.cs | 3 - .../logic/fol/inference/otter/ClauseFilter.cs | 2 - .../fol/inference/otter/ClauseSimplifier.cs | 2 - .../otter/LightestClauseHeuristic.cs | 2 - .../otter/defaultimpl/DefaultClauseFilter.cs | 3 - .../defaultimpl/DefaultClauseSimplifier.cs | 5 - .../DefaultLightestClauseHeuristic.cs | 4 - .../fol/inference/proof/AbstractProofStep.cs | 3 - .../logic/fol/inference/proof/Proof.cs | 2 - .../logic/fol/inference/proof/ProofFinal.cs | 2 - .../logic/fol/inference/proof/ProofPrinter.cs | 2 - .../logic/fol/inference/proof/ProofStep.cs | 3 - .../fol/inference/proof/ProofStepBwChGoal.cs | 3 - .../proof/ProofStepChainCancellation.cs | 3 - .../proof/ProofStepChainContrapositive.cs | 3 - .../inference/proof/ProofStepChainDropped.cs | 3 - .../proof/ProofStepChainFromClause.cs | 3 - .../proof/ProofStepChainReduction.cs | 3 - .../proof/ProofStepClauseBinaryResolvent.cs | 3 - .../proof/ProofStepClauseClausifySentence.cs | 3 - .../proof/ProofStepClauseDemodulation.cs | 3 - .../inference/proof/ProofStepClauseFactor.cs | 3 - .../proof/ProofStepClauseParamodulation.cs | 3 - .../proof/ProofStepFoChAlreadyAFact.cs | 3 - .../proof/ProofStepFoChAssertFact.cs | 3 - .../fol/inference/proof/ProofStepGoal.cs | 3 - .../fol/inference/proof/ProofStepPremise.cs | 3 - .../fol/inference/proof/ProofStepRenaming.cs | 3 - .../trace/FOLModelEliminationTracer.cs | 3 - .../inference/trace/FOLTFMResolutiontracer.cs | 3 - aima-csharp/logic/fol/kb/FOLKnowledgeBase.cs | 4 - .../logic/fol/kb/FOLKnowledgeBaseFactory.cs | 2 - aima-csharp/logic/fol/kb/data/CNF.cs | 4 - aima-csharp/logic/fol/kb/data/Chain.cs | 3 - aima-csharp/logic/fol/kb/data/Clause.cs | 4 - aima-csharp/logic/fol/kb/data/Literal.cs | 2 - .../logic/fol/kb/data/ReducedLiteral.cs | 2 - .../logic/fol/parsing/AbstractFOLVisitor.cs | 2 - aima-csharp/logic/fol/parsing/FOLLexer.cs | 4 - aima-csharp/logic/fol/parsing/FOLParser.cs | 2 - aima-csharp/logic/fol/parsing/FOLVisitor.cs | 2 - .../logic/fol/parsing/ast/AtomicSentence.cs | 2 - .../fol/parsing/ast/ConnectedSentence.cs | 3 - aima-csharp/logic/fol/parsing/ast/Constant.cs | 4 - aima-csharp/logic/fol/parsing/ast/FOLNode.cs | 3 - aima-csharp/logic/fol/parsing/ast/Function.cs | 3 - .../logic/fol/parsing/ast/NotSentence.cs | 6 - .../logic/fol/parsing/ast/Predicate.cs | 4 - .../fol/parsing/ast/QuantifiedSentence.cs | 4 - aima-csharp/logic/fol/parsing/ast/Sentence.cs | 2 - aima-csharp/logic/fol/parsing/ast/Term.cs | 2 - .../logic/fol/parsing/ast/TermEquality.cs | 4 - aima-csharp/logic/fol/parsing/ast/Variable.cs | 4 - .../logic/propositional/agent/KBAgent.cs | 8 +- .../logic/propositional/kb/KnowledgeBase.cs | 3 +- .../logic/propositional/parsing/PLVisitor.cs | 2 - .../parsing/ast/AtomicSentence.cs | 2 - .../parsing/ast/ComplexSentence.cs | 5 +- .../propositional/parsing/ast/Connective.cs | 4 +- .../parsing/ast/PropositionSymbol.cs | 3 +- .../propositional/parsing/ast/Sentence.cs | 6 +- aima-csharp/search/Local/Individual.cs | 5 +- aima-csharp/search/Local/Scheduler.cs | 5 +- .../search/framework/CutOffIndicatorAction.cs | 2 - .../search/framework/EvaluationFunction.cs | 3 - .../search/framework/HeuristicFunction.cs | 5 +- aima-csharp/search/framework/Metrics.cs | 5 +- aima-csharp/search/framework/Node.cs | 7 +- aima-csharp/search/framework/NodeExpander.cs | 5 +- .../search/framework/PathCostFunction.cs | 5 +- .../framework/PerceptToStateFunction.cs | 4 +- aima-csharp/search/framework/Search.cs | 3 +- aima-csharp/search/framework/SearchAgent.cs | 11 +- .../search/framework/SearchForActions.cs | 4 - aima-csharp/search/framework/SearchUtils.cs | 13 +- .../framework/SimpleProblemSolvingAgent.cs | 11 +- .../search/framework/SolutionChecker.cs | 5 +- .../framework/problem/ActionsFunction.cs | 3 +- .../framework/problem/BidirectionalProblem.cs | 2 - .../framework/problem/DefaultGoalTest.cs | 3 - .../problem/DefaultStepCostFunction.cs | 3 +- .../search/framework/problem/GoalTest.cs | 2 - .../search/framework/problem/Problem.cs | 3 - .../framework/problem/ResultFunction.cs | 3 +- .../framework/problem/StepCostFunction.cs | 3 +- .../search/framework/qsearch/GraphSearch.cs | 5 +- .../framework/qsearch/GraphSearchBFS.cs | 4 +- .../search/framework/qsearch/QueueSearch.cs | 9 +- .../search/framework/qsearch/TreeSearch.cs | 6 +- aima-csharp/search/online/LRTAStarAgent.cs | 13 +- aima-csharp/search/online/OnlineDFSAgent.cs | 15 +- .../search/online/OnlineSearchProblem.cs | 3 - aima-csharp/util/ArrayIterator.cs | 2 - aima-csharp/util/CSharpRandomizer.cs | 3 - aima-csharp/util/DisjointSets.cs | 4 - aima-csharp/util/FrequencyCounter.cs | 3 - aima-csharp/util/Interval.cs | 3 - aima-csharp/util/LUDecomposition.cs | 5 +- aima-csharp/util/LabeledGraph.cs | 3 - aima-csharp/util/LinkedHashSet.cs | 2 - aima-csharp/util/Matrix.cs | 4 - aima-csharp/util/MixedRadixNumber.cs | 3 - aima-csharp/util/MockRandomizer.cs | 2 - aima-csharp/util/Pair.cs | 3 - aima-csharp/util/Point2D.cs | 3 - aima-csharp/util/SetOps.cs | 4 - aima-csharp/util/Table.cs | 1 - aima-csharp/util/Triplet.cs | 5 +- aima-csharp/util/TwoKeyHashMap.cs | 2 - aima-csharp/util/Util.cs | 5 +- aima-csharp/util/Vector.cs | 3 - aima-csharp/util/XYLocation.cs | 3 - 211 files changed, 113 insertions(+), 954 deletions(-) delete mode 100644 aima-csharp/App.config delete mode 100644 aima-csharp/Properties/AssemblyInfo.cs diff --git a/aima-csharp.sln b/aima-csharp.sln index 5bda257..ebfbfd5 100644 --- 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 deleted file mode 100644 index 88fa402..0000000 --- a/aima-csharp/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/aima-csharp/Program.cs b/aima-csharp/Program.cs index 1685d68..5f28270 100644 --- 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) - { - } - } -} + \ No newline at end of file diff --git a/aima-csharp/Properties/AssemblyInfo.cs b/aima-csharp/Properties/AssemblyInfo.cs deleted file mode 100644 index d8ada94..0000000 --- a/aima-csharp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("aima-csharp")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("aima-csharp")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("125f53d5-1ccf-4daf-82fe-4324686cf417")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/aima-csharp/agent/Action.cs b/aima-csharp/agent/Action.cs index 4c0d89d..7375375 100644 --- a/aima-csharp/agent/Action.cs +++ b/aima-csharp/agent/Action.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.agent { /** @@ -8,7 +5,7 @@ namespace aima.core.agent * * @author Ciaran O'Reilly */ - public interface Action + public interface Action { /** * Indicates whether or not this Action is a 'No Operation'.
diff --git a/aima-csharp/agent/Agent.cs b/aima-csharp/agent/Agent.cs index d49568c..f202424 100644 --- 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 index 1bfee25..2d13aec 100644 --- 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 index faf0814..91b5469 100644 --- 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 index 7349134..3ac2eea 100644 --- 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 index 78022aa..e43a336 100644 --- 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 index f09eb73..95edcdd 100644 --- 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); } } \ No newline at end of file diff --git a/aima-csharp/agent/EnvironmentViewNotifier.cs b/aima-csharp/agent/EnvironmentViewNotifier.cs index b9a9c41..f1e54f8 100644 --- 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 index f9cc02e..d0809dd 100644 --- 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 index da7875a..89bb066 100644 --- 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.
* 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 index b4c8778..99bed5b 100644 --- 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 index b21cae5..b1a36ab 100644 --- a/aima-csharp/agent/impl/AbstractAgent.cs +++ b/aima-csharp/agent/impl/AbstractAgent.cs @@ -1,6 +1,3 @@ -using System; -using aima.core.agent; - namespace aima.core.agent.impl { /** @@ -8,7 +5,7 @@ namespace aima.core.agent.impl * @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 index f6f8ddd..b88ce64 100644 --- 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 index fddbb5f..9c098ec 100644 --- 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 index 41a3a74..ffdaa7d 100644 --- 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 index 756b3b6..d70def0 100644 --- 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 index ae116cb..d5c023b 100644 --- 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 index f619742..0c518b2 100644 --- 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 index c96996a..b65328e 100644 --- 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 attributes = new Dictionary(); diff --git a/aima-csharp/agent/impl/SimpleEnvironmentView.cs b/aima-csharp/agent/impl/SimpleEnvironmentView.cs index 486f8fa..8c8608f 100644 --- 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 index 3a594a6..2d98c97 100644 --- 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 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 rules) { diff --git a/aima-csharp/agent/impl/aprog/SimpleReflexAgentProgram.cs b/aima-csharp/agent/impl/aprog/SimpleReflexAgentProgram.cs index e028cef..7780a59 100644 --- 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 rules; diff --git a/aima-csharp/agent/impl/aprog/TableDrivenAgentProgram.cs b/aima-csharp/agent/impl/aprog/TableDrivenAgentProgram.cs index 2781310..d987d0c 100644 --- 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 index bdc983f..c29be65 100644 --- 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 { diff --git a/aima-csharp/agent/impl/aprog/simplerule/Condition.cs b/aima-csharp/agent/impl/aprog/simplerule/Condition.cs index 3b9fea9..f411442 100644 --- a/aima-csharp/agent/impl/aprog/simplerule/Condition.cs +++ b/aima-csharp/agent/impl/aprog/simplerule/Condition.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using aima.core.agent.impl; - namespace aima.core.agent.impl.aprog.simplerule { /** @@ -10,7 +6,7 @@ namespace aima.core.agent.impl.aprog.simplerule * @author Ciaran O'Reilly * */ - public abstract class Condition + public abstract class Condition { public abstract bool evaluate(ObjectWithDynamicAttributes p); diff --git a/aima-csharp/agent/impl/aprog/simplerule/EQUALCondition.cs b/aima-csharp/agent/impl/aprog/simplerule/EQUALCondition.cs index 2d3924f..8265bac 100644 --- a/aima-csharp/agent/impl/aprog/simplerule/EQUALCondition.cs +++ b/aima-csharp/agent/impl/aprog/simplerule/EQUALCondition.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 { @@ -12,7 +9,7 @@ namespace aima.core.agent.impl.aprog.simplerule * @author Ciaran O'Reilly * */ - public class EQUALCondition : Condition + public class EQUALCondition : Condition { private Object key; diff --git a/aima-csharp/agent/impl/aprog/simplerule/NOTCondition.cs b/aima-csharp/agent/impl/aprog/simplerule/NOTCondition.cs index 4739d93..387d286 100644 --- a/aima-csharp/agent/impl/aprog/simplerule/NOTCondition.cs +++ b/aima-csharp/agent/impl/aprog/simplerule/NOTCondition.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 { diff --git a/aima-csharp/agent/impl/aprog/simplerule/ORCondition.cs b/aima-csharp/agent/impl/aprog/simplerule/ORCondition.cs index 0ff0fc4..1181451 100644 --- a/aima-csharp/agent/impl/aprog/simplerule/ORCondition.cs +++ b/aima-csharp/agent/impl/aprog/simplerule/ORCondition.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 { diff --git a/aima-csharp/agent/impl/aprog/simplerule/Rule.cs b/aima-csharp/agent/impl/aprog/simplerule/Rule.cs index 9717a9d..a968a1c 100644 --- a/aima-csharp/agent/impl/aprog/simplerule/Rule.cs +++ b/aima-csharp/agent/impl/aprog/simplerule/Rule.cs @@ -1,8 +1,5 @@ -using System.Collections.Generic; using System.Text; using System.Diagnostics; -using aima.core.agent; -using aima.core.agent.impl; namespace aima.core.agent.impl.aprog.simplerule { @@ -12,7 +9,7 @@ namespace aima.core.agent.impl.aprog.simplerule * @author Ciaran O'Reilly * @author Mike Stampone */ - public class Rule + public class Rule { private Condition con; diff --git a/aima-csharp/aima-csharp.csproj b/aima-csharp/aima-csharp.csproj index a160271..952fcbf 100644 --- a/aima-csharp/aima-csharp.csproj +++ b/aima-csharp/aima-csharp.csproj @@ -1,272 +1,19 @@ - - - + + - Debug - AnyCPU - {125F53D5-1CCF-4DAF-82FE-4324686CF417} Exe - Properties + net6.0 aima_csharp - aima-csharp - v4.5.2 - 512 - true + enable + enable - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - - \ No newline at end of file + + diff --git a/aima-csharp/environment/cellworld/Cell.cs b/aima-csharp/environment/cellworld/Cell.cs index 967c20d..9000d3b 100644 --- a/aima-csharp/environment/cellworld/Cell.cs +++ b/aima-csharp/environment/cellworld/Cell.cs @@ -1,5 +1,3 @@ -using System; - namespace aima.core.environment.cellworld { /** diff --git a/aima-csharp/environment/cellworld/CellWorld.cs b/aima-csharp/environment/cellworld/CellWorld.cs index 9f5248c..6ec48b7 100644 --- a/aima-csharp/environment/cellworld/CellWorld.cs +++ b/aima-csharp/environment/cellworld/CellWorld.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.util; namespace aima.core.environment.cellworld diff --git a/aima-csharp/environment/cellworld/CellWorldAction.cs b/aima-csharp/environment/cellworld/CellWorldAction.cs index 1e651ab..3b8b185 100644 --- a/aima-csharp/environment/cellworld/CellWorldAction.cs +++ b/aima-csharp/environment/cellworld/CellWorldAction.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using aima.core.agent; using aima.core.util; @@ -17,7 +16,7 @@ namespace aima.core.environment.cellworld * @author Ciaran O'Reilly * */ - public class CellWorldAction : Action + public class CellWorldAction : agent.Action { public CellWorldAction() { diff --git a/aima-csharp/environment/cellworld/CellWorldFactory.cs b/aima-csharp/environment/cellworld/CellWorldFactory.cs index 792bb46..b4f4bdd 100644 --- a/aima-csharp/environment/cellworld/CellWorldFactory.cs +++ b/aima-csharp/environment/cellworld/CellWorldFactory.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.environment.cellworld { /** @@ -8,7 +5,7 @@ namespace aima.core.environment.cellworld * @author Ciaran O'Reilly * */ - public class CellWorldFactory + public class CellWorldFactory { /** * Create the cell world as defined in Figure 17.1 in AIMA3e. (a) A simple 4 diff --git a/aima-csharp/environment/eightpuzzle/BidirectionalEightPuzzleProblem.cs b/aima-csharp/environment/eightpuzzle/BidirectionalEightPuzzleProblem.cs index cdd57b8..62afb66 100644 --- a/aima-csharp/environment/eightpuzzle/BidirectionalEightPuzzleProblem.cs +++ b/aima-csharp/environment/eightpuzzle/BidirectionalEightPuzzleProblem.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using aima.core.search.framework.problem; namespace aima.core.environment.eightpuzzle diff --git a/aima-csharp/environment/eightpuzzle/EightPuzzleBoard.cs b/aima-csharp/environment/eightpuzzle/EightPuzzleBoard.cs index 87878e6..0436338 100644 --- a/aima-csharp/environment/eightpuzzle/EightPuzzleBoard.cs +++ b/aima-csharp/environment/eightpuzzle/EightPuzzleBoard.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using aima.core.agent; using aima.core.agent.impl; using aima.core.util; diff --git a/aima-csharp/environment/eightpuzzle/EightPuzzleFunctionFactory.cs b/aima-csharp/environment/eightpuzzle/EightPuzzleFunctionFactory.cs index 039cc6b..720bf62 100644 --- a/aima-csharp/environment/eightpuzzle/EightPuzzleFunctionFactory.cs +++ b/aima-csharp/environment/eightpuzzle/EightPuzzleFunctionFactory.cs @@ -1,7 +1,5 @@ -using System.Collections.Generic; using aima.core.agent; using aima.core.search.framework.problem; -using aima.core.util; namespace aima.core.environment.eightpuzzle { @@ -34,11 +32,11 @@ public static ResultFunction getResultFunction() private class EPActionsFunction : ActionsFunction { - public HashSet actions(System.Object state) + public HashSet actions(System.Object state) { EightPuzzleBoard board = (EightPuzzleBoard)state; - HashSet actions = new HashSet(); + HashSet actions = new HashSet(); if (board.canMoveGap(EightPuzzleBoard.UP)) { @@ -63,7 +61,7 @@ public HashSet actions(System.Object state) private class EPResultFunction : ResultFunction { - public System.Object result(System.Object s, Action a) + public System.Object result(System.Object s, agent.Action a) { EightPuzzleBoard board = (EightPuzzleBoard) s; diff --git a/aima-csharp/environment/eightpuzzle/EightPuzzleGoalTest.cs b/aima-csharp/environment/eightpuzzle/EightPuzzleGoalTest.cs index fa33513..d924bda 100644 --- a/aima-csharp/environment/eightpuzzle/EightPuzzleGoalTest.cs +++ b/aima-csharp/environment/eightpuzzle/EightPuzzleGoalTest.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.search.framework.problem; namespace aima.core.environment.eightpuzzle diff --git a/aima-csharp/environment/eightpuzzle/ManhattanHeuristicFunction.cs b/aima-csharp/environment/eightpuzzle/ManhattanHeuristicFunction.cs index 512155a..376002f 100644 --- a/aima-csharp/environment/eightpuzzle/ManhattanHeuristicFunction.cs +++ b/aima-csharp/environment/eightpuzzle/ManhattanHeuristicFunction.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.search.framework; using aima.core.util; diff --git a/aima-csharp/environment/eightpuzzle/MisplacedTilleHeuristicFunction.cs b/aima-csharp/environment/eightpuzzle/MisplacedTilleHeuristicFunction.cs index 10e8ca4..8dc77c7 100644 --- a/aima-csharp/environment/eightpuzzle/MisplacedTilleHeuristicFunction.cs +++ b/aima-csharp/environment/eightpuzzle/MisplacedTilleHeuristicFunction.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.search.framework; using aima.core.util; diff --git a/aima-csharp/environment/map/AdaptableHeuristicFunction.cs b/aima-csharp/environment/map/AdaptableHeuristicFunction.cs index a5546bb..bfbec13 100644 --- a/aima-csharp/environment/map/AdaptableHeuristicFunction.cs +++ b/aima-csharp/environment/map/AdaptableHeuristicFunction.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using aima.core.search.framework; - namespace aima.core.environment.map { /** diff --git a/aima-csharp/environment/map/BidirectionalMapProblem.cs b/aima-csharp/environment/map/BidirectionalMapProblem.cs index 4aa5cfc..67ddd76 100644 --- a/aima-csharp/environment/map/BidirectionalMapProblem.cs +++ b/aima-csharp/environment/map/BidirectionalMapProblem.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.search.framework.problem; namespace aima.core.environment.map diff --git a/aima-csharp/environment/map/DynAttributeNames.cs b/aima-csharp/environment/map/DynAttributeNames.cs index 99f0689..da82b28 100644 --- a/aima-csharp/environment/map/DynAttributeNames.cs +++ b/aima-csharp/environment/map/DynAttributeNames.cs @@ -1,5 +1,3 @@ -using System; - namespace aima.core.environment.map { /** diff --git a/aima-csharp/environment/map/ExtendableMap.cs b/aima-csharp/environment/map/ExtendableMap.cs index b60f2c2..6495b8e 100644 --- a/aima-csharp/environment/map/ExtendableMap.cs +++ b/aima-csharp/environment/map/ExtendableMap.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.util; namespace aima.core.environment.map diff --git a/aima-csharp/environment/map/Map.cs b/aima-csharp/environment/map/Map.cs index c0537b4..db58341 100644 --- a/aima-csharp/environment/map/Map.cs +++ b/aima-csharp/environment/map/Map.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.util; namespace aima.core.environment.map diff --git a/aima-csharp/environment/map/MapAgent.cs b/aima-csharp/environment/map/MapAgent.cs index e4160cf..f932777 100644 --- a/aima-csharp/environment/map/MapAgent.cs +++ b/aima-csharp/environment/map/MapAgent.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.agent; using aima.core.agent.impl; using aima.core.search.framework; diff --git a/aima-csharp/environment/map/MapEnvironment.cs b/aima-csharp/environment/map/MapEnvironment.cs index 5369356..ed8bbba 100644 --- a/aima-csharp/environment/map/MapEnvironment.cs +++ b/aima-csharp/environment/map/MapEnvironment.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using aima.core.agent; using aima.core.agent.impl; @@ -44,7 +43,7 @@ public override EnvironmentState getCurrentState() return state; } - public override EnvironmentState executeAction(Agent agent, Action a) + public override EnvironmentState executeAction(Agent agent, agent.Action a) { if (!a.isNoOp()) diff --git a/aima-csharp/environment/map/MapEnvironmentState.cs b/aima-csharp/environment/map/MapEnvironmentState.cs index bb9131c..92eed72 100644 --- a/aima-csharp/environment/map/MapEnvironmentState.cs +++ b/aima-csharp/environment/map/MapEnvironmentState.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using aima.core.agent; using aima.core.util; diff --git a/aima-csharp/environment/map/MapFunctionFactory.cs b/aima-csharp/environment/map/MapFunctionFactory.cs index 5f5a8bc..cc09dab 100644 --- a/aima-csharp/environment/map/MapFunctionFactory.cs +++ b/aima-csharp/environment/map/MapFunctionFactory.cs @@ -1,9 +1,7 @@ -using System.Collections.Generic; using aima.core.agent; using aima.core.agent.impl; using aima.core.search.framework; using aima.core.search.framework.problem; -using aima.core.util; namespace aima.core.environment.map { @@ -46,9 +44,9 @@ public MapActionsFunction(Map map, bool reverseMode) this.reverseMode = reverseMode; } - public HashSet actions(System.Object state) + public HashSet actions(System.Object state) { - HashSet actions = new HashSet(); + HashSet actions = new HashSet(); System.String location = state.ToString(); List linkedLocations = reverseMode ? map.getPossiblePrevLocations(location) @@ -76,7 +74,7 @@ public MapResultFunction() { } - public System.Object result(System.Object s, Action a) + public System.Object result(System.Object s, agent.Action a) { if (a is MoveToAction) diff --git a/aima-csharp/environment/map/MapStepCostFunction.cs b/aima-csharp/environment/map/MapStepCostFunction.cs index 0baefec..3675fc5 100644 --- a/aima-csharp/environment/map/MapStepCostFunction.cs +++ b/aima-csharp/environment/map/MapStepCostFunction.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using aima.core.agent; using aima.core.search.framework.problem; @@ -27,7 +26,7 @@ public MapStepCostFunction(Map map) // // START-StepCostFunction - public double c(object fromCurrentState, Action action, object toNextState) + public double c(object fromCurrentState, agent.Action action, object toNextState) { string fromLoc = fromCurrentState.ToString(); diff --git a/aima-csharp/environment/map/MoveToAction.cs b/aima-csharp/environment/map/MoveToAction.cs index b791a7c..7aab571 100644 --- a/aima-csharp/environment/map/MoveToAction.cs +++ b/aima-csharp/environment/map/MoveToAction.cs @@ -1,9 +1,7 @@ -using System; -using System.Collections.Generic; using aima.core.agent.impl; namespace aima.core.environment.map -{ +{ public class MoveToAction : DynamicAction { public const String ATTRIBUTE_MOVE_TO_LOCATION = "location"; diff --git a/aima-csharp/environment/map/Scenario.cs b/aima-csharp/environment/map/Scenario.cs index ec68c19..c58b44b 100644 --- a/aima-csharp/environment/map/Scenario.cs +++ b/aima-csharp/environment/map/Scenario.cs @@ -1,5 +1,3 @@ -using System; - namespace aima.core.environment.map { /** diff --git a/aima-csharp/environment/map/SimplifiedRoadMapOfAustralia.cs b/aima-csharp/environment/map/SimplifiedRoadMapOfAustralia.cs index 0f23815..5337ce7 100644 --- a/aima-csharp/environment/map/SimplifiedRoadMapOfAustralia.cs +++ b/aima-csharp/environment/map/SimplifiedRoadMapOfAustralia.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.environment.map { /** diff --git a/aima-csharp/environment/map/SimplifiedRoadMapOfPartOfRomania.cs b/aima-csharp/environment/map/SimplifiedRoadMapOfPartOfRomania.cs index 3b9ed9c..c711d66 100644 --- a/aima-csharp/environment/map/SimplifiedRoadMapOfPartOfRomania.cs +++ b/aima-csharp/environment/map/SimplifiedRoadMapOfPartOfRomania.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.environment.map { /** diff --git a/aima-csharp/environment/map/StraightLineDistanceHeuristicFunction.cs b/aima-csharp/environment/map/StraightLineDistanceHeuristicFunction.cs index 653d6c1..404f10d 100644 --- a/aima-csharp/environment/map/StraightLineDistanceHeuristicFunction.cs +++ b/aima-csharp/environment/map/StraightLineDistanceHeuristicFunction.cs @@ -1,4 +1,3 @@ -using System; using aima.core.util; namespace aima.core.environment.map diff --git a/aima-csharp/environment/wumpusworld/AgentPercept.cs b/aima-csharp/environment/wumpusworld/AgentPercept.cs index d090c57..ab4ce67 100644 --- a/aima-csharp/environment/wumpusworld/AgentPercept.cs +++ b/aima-csharp/environment/wumpusworld/AgentPercept.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using aima.core.agent; namespace aima.core.environment.wumpusworld diff --git a/aima-csharp/environment/wumpusworld/AgentPosition.cs b/aima-csharp/environment/wumpusworld/AgentPosition.cs index 48a7629..89fe494 100644 --- a/aima-csharp/environment/wumpusworld/AgentPosition.cs +++ b/aima-csharp/environment/wumpusworld/AgentPosition.cs @@ -1,6 +1,4 @@ -using System; - -namespace aima.core.environment.wumpusworld +namespace aima.core.environment.wumpusworld { internal class AgentPosition { diff --git a/aima-csharp/environment/wumpusworld/ManhattanHeuristicFunction.cs b/aima-csharp/environment/wumpusworld/ManhattanHeuristicFunction.cs index 5c07b75..42dc5a0 100644 --- a/aima-csharp/environment/wumpusworld/ManhattanHeuristicFunction.cs +++ b/aima-csharp/environment/wumpusworld/ManhattanHeuristicFunction.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.search.framework; namespace aima.core.environment.wumpusworld diff --git a/aima-csharp/environment/wumpusworld/Room.cs b/aima-csharp/environment/wumpusworld/Room.cs index d0856ae..8a2a0d7 100644 --- a/aima-csharp/environment/wumpusworld/Room.cs +++ b/aima-csharp/environment/wumpusworld/Room.cs @@ -1,5 +1,3 @@ -using System.Collections.Generic; - namespace aima.core.environment.wumpusworld { /** diff --git a/aima-csharp/logic/common/Lexer.cs b/aima-csharp/logic/common/Lexer.cs index 0de85c6..8ac543d 100644 --- a/aima-csharp/logic/common/Lexer.cs +++ b/aima-csharp/logic/common/Lexer.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.IO; - namespace aima.core.logic.common { /** diff --git a/aima-csharp/logic/common/LexerException.cs b/aima-csharp/logic/common/LexerException.cs index 6a9f614..5f18fab 100644 --- a/aima-csharp/logic/common/LexerException.cs +++ b/aima-csharp/logic/common/LexerException.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.logic.common { /** diff --git a/aima-csharp/logic/common/LogicTokenTypes.cs b/aima-csharp/logic/common/LogicTokenTypes.cs index 5c9fd8e..6ac63f5 100644 --- a/aima-csharp/logic/common/LogicTokenTypes.cs +++ b/aima-csharp/logic/common/LogicTokenTypes.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.logic.common { /** diff --git a/aima-csharp/logic/common/Parser.cs b/aima-csharp/logic/common/Parser.cs index 787ebc0..327209c 100644 --- a/aima-csharp/logic/common/Parser.cs +++ b/aima-csharp/logic/common/Parser.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.IO; - namespace aima.core.logic.common { diff --git a/aima-csharp/logic/common/ParserException.cs b/aima-csharp/logic/common/ParserException.cs index ca75e2e..7e86671 100644 --- a/aima-csharp/logic/common/ParserException.cs +++ b/aima-csharp/logic/common/ParserException.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.logic.common { /** diff --git a/aima-csharp/logic/common/Token.cs b/aima-csharp/logic/common/Token.cs index 8caa148..13b4e0a 100644 --- a/aima-csharp/logic/common/Token.cs +++ b/aima-csharp/logic/common/Token.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.logic.common { /** diff --git a/aima-csharp/logic/fol/CNFConverter.cs b/aima-csharp/logic/fol/CNFConverter.cs index 306b25f..37a07a5 100644 --- a/aima-csharp/logic/fol/CNFConverter.cs +++ b/aima-csharp/logic/fol/CNFConverter.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing; using aima.core.logic.fol.parsing.ast; @@ -21,7 +19,7 @@ namespace aima.core.logic.fol * @author Ciaran O'Reilly * @author Mike Stampone */ - public class CNFConverter + public class CNFConverter { private FOLParser parser = null; private SubstVisitor substVisitor; diff --git a/aima-csharp/logic/fol/Connectors.cs b/aima-csharp/logic/fol/Connectors.cs index 1936d36..8388e9f 100644 --- a/aima-csharp/logic/fol/Connectors.cs +++ b/aima-csharp/logic/fol/Connectors.cs @@ -1,5 +1,3 @@ -using System; - namespace aima.core.logic.fol { /** diff --git a/aima-csharp/logic/fol/PredicateCollector.cs b/aima-csharp/logic/fol/PredicateCollector.cs index 5047e25..8028999 100644 --- a/aima-csharp/logic/fol/PredicateCollector.cs +++ b/aima-csharp/logic/fol/PredicateCollector.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.parsing; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/Quantifiers.cs b/aima-csharp/logic/fol/Quantifiers.cs index f98410a..fc55719 100644 --- a/aima-csharp/logic/fol/Quantifiers.cs +++ b/aima-csharp/logic/fol/Quantifiers.cs @@ -1,5 +1,3 @@ -using System; - namespace aima.core.logic.fol { /** diff --git a/aima-csharp/logic/fol/StandardizeApart.cs b/aima-csharp/logic/fol/StandardizeApart.cs index 16753d2..12b7f13 100644 --- a/aima-csharp/logic/fol/StandardizeApart.cs +++ b/aima-csharp/logic/fol/StandardizeApart.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.inference.proof; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/StandardizeApartInPlace.cs b/aima-csharp/logic/fol/StandardizeApartInPlace.cs index 15bc21d..7a0d8d2 100644 --- a/aima-csharp/logic/fol/StandardizeApartInPlace.cs +++ b/aima-csharp/logic/fol/StandardizeApartInPlace.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/StandardizeApartIndexical.cs b/aima-csharp/logic/fol/StandardizeApartIndexical.cs index 532f474..e8b1751 100644 --- a/aima-csharp/logic/fol/StandardizeApartIndexical.cs +++ b/aima-csharp/logic/fol/StandardizeApartIndexical.cs @@ -1,5 +1,3 @@ -using System; - namespace aima.core.logic.fol { /** diff --git a/aima-csharp/logic/fol/StandardizeApartIndexicalFactory.cs b/aima-csharp/logic/fol/StandardizeApartIndexicalFactory.cs index e2f9415..6c92530 100644 --- a/aima-csharp/logic/fol/StandardizeApartIndexicalFactory.cs +++ b/aima-csharp/logic/fol/StandardizeApartIndexicalFactory.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using System.Text; namespace aima.core.logic.fol diff --git a/aima-csharp/logic/fol/StandardizeApartResult.cs b/aima-csharp/logic/fol/StandardizeApartResult.cs index 881d458..44b220a 100644 --- a/aima-csharp/logic/fol/StandardizeApartResult.cs +++ b/aima-csharp/logic/fol/StandardizeApartResult.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.parsing.ast; namespace aima.core.logic.fol diff --git a/aima-csharp/logic/fol/SubstVisitor.cs b/aima-csharp/logic/fol/SubstVisitor.cs index b7d4d77..efa3b55 100644 --- a/aima-csharp/logic/fol/SubstVisitor.cs +++ b/aima-csharp/logic/fol/SubstVisitor.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/SubsumptionElimination.cs b/aima-csharp/logic/fol/SubsumptionElimination.cs index c8699bd..c6d7aa4 100644 --- a/aima-csharp/logic/fol/SubsumptionElimination.cs +++ b/aima-csharp/logic/fol/SubsumptionElimination.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.kb.data; namespace aima.core.logic.fol diff --git a/aima-csharp/logic/fol/Unifier.cs b/aima-csharp/logic/fol/Unifier.cs index 4c4ba6d..618af0f 100644 --- a/aima-csharp/logic/fol/Unifier.cs +++ b/aima-csharp/logic/fol/Unifier.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; using aima.core.logic.fol.parsing.ast; namespace aima.core.logic.fol diff --git a/aima-csharp/logic/fol/VariableCollector.cs b/aima-csharp/logic/fol/VariableCollector.cs index e1ba71a..984d7ac 100644 --- a/aima-csharp/logic/fol/VariableCollector.cs +++ b/aima-csharp/logic/fol/VariableCollector.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.parsing; using aima.core.logic.fol.parsing.ast; using aima.core.logic.fol.kb.data; diff --git a/aima-csharp/logic/fol/domain/DomainFactory.cs b/aima-csharp/logic/fol/domain/DomainFactory.cs index 07bb7c8..93c3aff 100644 --- a/aima-csharp/logic/fol/domain/DomainFactory.cs +++ b/aima-csharp/logic/fol/domain/DomainFactory.cs @@ -1,5 +1,3 @@ -using System; - namespace aima.core.logic.fol.domain { /** diff --git a/aima-csharp/logic/fol/domain/FOLDomain.cs b/aima-csharp/logic/fol/domain/FOLDomain.cs index 3367744..17f4a5d 100644 --- a/aima-csharp/logic/fol/domain/FOLDomain.cs +++ b/aima-csharp/logic/fol/domain/FOLDomain.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using aima.core.util; - namespace aima.core.logic.fol.domain { /** diff --git a/aima-csharp/logic/fol/domain/FOLDomainAnswerLiteralAddedEvent.cs b/aima-csharp/logic/fol/domain/FOLDomainAnswerLiteralAddedEvent.cs index bf06e0a..4558619 100644 --- a/aima-csharp/logic/fol/domain/FOLDomainAnswerLiteralAddedEvent.cs +++ b/aima-csharp/logic/fol/domain/FOLDomainAnswerLiteralAddedEvent.cs @@ -1,5 +1,3 @@ -using System; - namespace aima.core.logic.fol.domain { /** diff --git a/aima-csharp/logic/fol/domain/FOLDomainEvent.cs b/aima-csharp/logic/fol/domain/FOLDomainEvent.cs index 8c12954..be5aa60 100644 --- a/aima-csharp/logic/fol/domain/FOLDomainEvent.cs +++ b/aima-csharp/logic/fol/domain/FOLDomainEvent.cs @@ -1,5 +1,3 @@ -using System; - namespace aima.core.logic.fol.domain { /** diff --git a/aima-csharp/logic/fol/domain/FOLDomainListener.cs b/aima-csharp/logic/fol/domain/FOLDomainListener.cs index 6599984..3891bd3 100644 --- a/aima-csharp/logic/fol/domain/FOLDomainListener.cs +++ b/aima-csharp/logic/fol/domain/FOLDomainListener.cs @@ -1,5 +1,3 @@ -using System; - namespace aima.core.logic.fol.domain { /** diff --git a/aima-csharp/logic/fol/domain/FOLDomainSkolemConstantAddedEvent.cs b/aima-csharp/logic/fol/domain/FOLDomainSkolemConstantAddedEvent.cs index 8b5217c..cd84741 100644 --- a/aima-csharp/logic/fol/domain/FOLDomainSkolemConstantAddedEvent.cs +++ b/aima-csharp/logic/fol/domain/FOLDomainSkolemConstantAddedEvent.cs @@ -1,5 +1,3 @@ -using System; - namespace aima.core.logic.fol.domain { /** diff --git a/aima-csharp/logic/fol/domain/FOLDomainSkolemFunctionAddedEvent.cs b/aima-csharp/logic/fol/domain/FOLDomainSkolemFunctionAddedEvent.cs index a5c3191..7f506fa 100644 --- a/aima-csharp/logic/fol/domain/FOLDomainSkolemFunctionAddedEvent.cs +++ b/aima-csharp/logic/fol/domain/FOLDomainSkolemFunctionAddedEvent.cs @@ -1,5 +1,3 @@ -using System; - namespace aima.core.logic.fol.domain { /** diff --git a/aima-csharp/logic/fol/inference/AbstractModulation.cs b/aima-csharp/logic/fol/inference/AbstractModulation.cs index bfbdcbf..33f8ac5 100644 --- a/aima-csharp/logic/fol/inference/AbstractModulation.cs +++ b/aima-csharp/logic/fol/inference/AbstractModulation.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using aima.core.logic.fol; using aima.core.logic.fol.parsing; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/inference/Demodulation.cs b/aima-csharp/logic/fol/inference/Demodulation.cs index 1628050..5f01ce1 100644 --- a/aima-csharp/logic/fol/inference/Demodulation.cs +++ b/aima-csharp/logic/fol/inference/Demodulation.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; using aima.core.logic.fol.inference.proof; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/inference/FOLBCAsk.cs b/aima-csharp/logic/fol/inference/FOLBCAsk.cs index 22de132..ee42ad3 100644 --- a/aima-csharp/logic/fol/inference/FOLBCAsk.cs +++ b/aima-csharp/logic/fol/inference/FOLBCAsk.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; using aima.core.logic.fol.inference.proof; using aima.core.logic.fol.kb; using aima.core.logic.fol.kb.data; diff --git a/aima-csharp/logic/fol/inference/FOLFCAsk.cs b/aima-csharp/logic/fol/inference/FOLFCAsk.cs index 5d5122d..7b72f5a 100644 --- a/aima-csharp/logic/fol/inference/FOLFCAsk.cs +++ b/aima-csharp/logic/fol/inference/FOLFCAsk.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.inference.proof; using aima.core.logic.fol.kb; using aima.core.logic.fol.kb.data; diff --git a/aima-csharp/logic/fol/inference/FOLModelElimination.cs b/aima-csharp/logic/fol/inference/FOLModelElimination.cs index 93154a6..99bac75 100644 --- a/aima-csharp/logic/fol/inference/FOLModelElimination.cs +++ b/aima-csharp/logic/fol/inference/FOLModelElimination.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; using System.Text; using aima.core.logic.fol.kb; -using aima.core.logic.fol.parsing; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing.ast; using aima.core.logic.fol.inference.proof; diff --git a/aima-csharp/logic/fol/inference/FOLOTTERLikeTheoremProver.cs b/aima-csharp/logic/fol/inference/FOLOTTERLikeTheoremProver.cs index 251a8b5..bee0422 100644 --- a/aima-csharp/logic/fol/inference/FOLOTTERLikeTheoremProver.cs +++ b/aima-csharp/logic/fol/inference/FOLOTTERLikeTheoremProver.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; using System.Text; using aima.core.logic.fol.inference.otter; using aima.core.logic.fol.inference.otter.defaultimpl; @@ -8,7 +5,6 @@ using aima.core.logic.fol.kb; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing.ast; -using aima.core.logic.fol; namespace aima.core.logic.fol.inference { diff --git a/aima-csharp/logic/fol/inference/FOLTFMResolution.cs b/aima-csharp/logic/fol/inference/FOLTFMResolution.cs index 8546927..d43cdb3 100644 --- a/aima-csharp/logic/fol/inference/FOLTFMResolution.cs +++ b/aima-csharp/logic/fol/inference/FOLTFMResolution.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; using System.Text; -using aima.core.logic.fol; using aima.core.logic.fol.inference.proof; using aima.core.logic.fol.inference.trace; using aima.core.logic.fol.kb; diff --git a/aima-csharp/logic/fol/inference/InferenceProcedure.cs b/aima-csharp/logic/fol/inference/InferenceProcedure.cs index 8c1bcff..32f8df1 100644 --- a/aima-csharp/logic/fol/inference/InferenceProcedure.cs +++ b/aima-csharp/logic/fol/inference/InferenceProcedure.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.kb; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/inference/InferenceResult.cs b/aima-csharp/logic/fol/inference/InferenceResult.cs index 7c442ca..005dffc 100644 --- a/aima-csharp/logic/fol/inference/InferenceResult.cs +++ b/aima-csharp/logic/fol/inference/InferenceResult.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.inference.proof; namespace aima.core.logic.fol.inference diff --git a/aima-csharp/logic/fol/inference/InferenceResultPrinter.cs b/aima-csharp/logic/fol/inference/InferenceResultPrinter.cs index cc1de9b..35c6deb 100644 --- a/aima-csharp/logic/fol/inference/InferenceResultPrinter.cs +++ b/aima-csharp/logic/fol/inference/InferenceResultPrinter.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using System.Text; using aima.core.logic.fol.inference.proof; diff --git a/aima-csharp/logic/fol/inference/Paramodulation.cs b/aima-csharp/logic/fol/inference/Paramodulation.cs index 324a8e5..7f04941 100644 --- a/aima-csharp/logic/fol/inference/Paramodulation.cs +++ b/aima-csharp/logic/fol/inference/Paramodulation.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using aima.core.logic.fol; using aima.core.logic.fol.inference.proof; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/inference/otter/ClauseFilter.cs b/aima-csharp/logic/fol/inference/otter/ClauseFilter.cs index 95080ac..6f18a98 100644 --- a/aima-csharp/logic/fol/inference/otter/ClauseFilter.cs +++ b/aima-csharp/logic/fol/inference/otter/ClauseFilter.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.kb.data; namespace aima.core.logic.fol.inference.otter diff --git a/aima-csharp/logic/fol/inference/otter/ClauseSimplifier.cs b/aima-csharp/logic/fol/inference/otter/ClauseSimplifier.cs index aead210..1166298 100644 --- a/aima-csharp/logic/fol/inference/otter/ClauseSimplifier.cs +++ b/aima-csharp/logic/fol/inference/otter/ClauseSimplifier.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.kb.data; namespace aima.core.logic.fol.inference.otter diff --git a/aima-csharp/logic/fol/inference/otter/LightestClauseHeuristic.cs b/aima-csharp/logic/fol/inference/otter/LightestClauseHeuristic.cs index 5801fe3..fa9f833 100644 --- a/aima-csharp/logic/fol/inference/otter/LightestClauseHeuristic.cs +++ b/aima-csharp/logic/fol/inference/otter/LightestClauseHeuristic.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.kb.data; namespace aima.core.logic.fol.inference.otter diff --git a/aima-csharp/logic/fol/inference/otter/defaultimpl/DefaultClauseFilter.cs b/aima-csharp/logic/fol/inference/otter/defaultimpl/DefaultClauseFilter.cs index 196d755..04a1fcf 100644 --- a/aima-csharp/logic/fol/inference/otter/defaultimpl/DefaultClauseFilter.cs +++ b/aima-csharp/logic/fol/inference/otter/defaultimpl/DefaultClauseFilter.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using aima.core.logic.fol.inference.otter; using aima.core.logic.fol.kb.data; namespace aima.core.logic.fol.inference.otter.defaultimpl diff --git a/aima-csharp/logic/fol/inference/otter/defaultimpl/DefaultClauseSimplifier.cs b/aima-csharp/logic/fol/inference/otter/defaultimpl/DefaultClauseSimplifier.cs index 330c53c..e18d7f6 100644 --- a/aima-csharp/logic/fol/inference/otter/defaultimpl/DefaultClauseSimplifier.cs +++ b/aima-csharp/logic/fol/inference/otter/defaultimpl/DefaultClauseSimplifier.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using aima.core.logic.fol.inference; -using aima.core.logic.fol.inference.otter; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/inference/otter/defaultimpl/DefaultLightestClauseHeuristic.cs b/aima-csharp/logic/fol/inference/otter/defaultimpl/DefaultLightestClauseHeuristic.cs index 1b001c8..0db260e 100644 --- a/aima-csharp/logic/fol/inference/otter/defaultimpl/DefaultLightestClauseHeuristic.cs +++ b/aima-csharp/logic/fol/inference/otter/defaultimpl/DefaultLightestClauseHeuristic.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using aima.core.logic.fol.inference.otter; using aima.core.logic.fol.kb.data; namespace aima.core.logic.fol.inference.otter.defaultimpl diff --git a/aima-csharp/logic/fol/inference/proof/AbstractProofStep.cs b/aima-csharp/logic/fol/inference/proof/AbstractProofStep.cs index c90fd31..d1add0e 100644 --- a/aima-csharp/logic/fol/inference/proof/AbstractProofStep.cs +++ b/aima-csharp/logic/fol/inference/proof/AbstractProofStep.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.logic.fol.inference.proof { /** diff --git a/aima-csharp/logic/fol/inference/proof/Proof.cs b/aima-csharp/logic/fol/inference/proof/Proof.cs index 6bf4220..c0f4a9e 100644 --- a/aima-csharp/logic/fol/inference/proof/Proof.cs +++ b/aima-csharp/logic/fol/inference/proof/Proof.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.parsing.ast; namespace aima.core.logic.fol.inference.proof diff --git a/aima-csharp/logic/fol/inference/proof/ProofFinal.cs b/aima-csharp/logic/fol/inference/proof/ProofFinal.cs index 51f3c20..262b257 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofFinal.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofFinal.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.parsing.ast; namespace aima.core.logic.fol.inference.proof diff --git a/aima-csharp/logic/fol/inference/proof/ProofPrinter.cs b/aima-csharp/logic/fol/inference/proof/ProofPrinter.cs index 7ad533e..3063e53 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofPrinter.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofPrinter.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using System.Text; namespace aima.core.logic.fol.inference.proof diff --git a/aima-csharp/logic/fol/inference/proof/ProofStep.cs b/aima-csharp/logic/fol/inference/proof/ProofStep.cs index ba48e1a..46555fb 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofStep.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofStep.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.logic.fol.inference.proof { /** diff --git a/aima-csharp/logic/fol/inference/proof/ProofStepBwChGoal.cs b/aima-csharp/logic/fol/inference/proof/ProofStepBwChGoal.cs index 8142edd..e23014a 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofStepBwChGoal.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofStepBwChGoal.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; using System.Text; -using System.Linq; using System.Collections.ObjectModel; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/inference/proof/ProofStepChainCancellation.cs b/aima-csharp/logic/fol/inference/proof/ProofStepChainCancellation.cs index 5674dab..52346db 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofStepChainCancellation.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofStepChainCancellation.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; using System.Collections.ObjectModel; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/inference/proof/ProofStepChainContrapositive.cs b/aima-csharp/logic/fol/inference/proof/ProofStepChainContrapositive.cs index 5ac87b9..e27d061 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofStepChainContrapositive.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofStepChainContrapositive.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; using System.Collections.ObjectModel; using aima.core.logic.fol.kb.data; diff --git a/aima-csharp/logic/fol/inference/proof/ProofStepChainDropped.cs b/aima-csharp/logic/fol/inference/proof/ProofStepChainDropped.cs index 5abec6e..e532648 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofStepChainDropped.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofStepChainDropped.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; using System.Collections.ObjectModel; using aima.core.logic.fol.kb.data; diff --git a/aima-csharp/logic/fol/inference/proof/ProofStepChainFromClause.cs b/aima-csharp/logic/fol/inference/proof/ProofStepChainFromClause.cs index 8109e26..2cb99f0 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofStepChainFromClause.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofStepChainFromClause.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; using System.Collections.ObjectModel; using aima.core.logic.fol.kb.data; diff --git a/aima-csharp/logic/fol/inference/proof/ProofStepChainReduction.cs b/aima-csharp/logic/fol/inference/proof/ProofStepChainReduction.cs index 6b999c5..4795b48 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofStepChainReduction.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofStepChainReduction.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; using System.Collections.ObjectModel; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/inference/proof/ProofStepClauseBinaryResolvent.cs b/aima-csharp/logic/fol/inference/proof/ProofStepClauseBinaryResolvent.cs index 454a18e..d3bf02f 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofStepClauseBinaryResolvent.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofStepClauseBinaryResolvent.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; using System.Collections.ObjectModel; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/inference/proof/ProofStepClauseClausifySentence.cs b/aima-csharp/logic/fol/inference/proof/ProofStepClauseClausifySentence.cs index c01daf8..a217b16 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofStepClauseClausifySentence.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofStepClauseClausifySentence.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; using System.Collections.ObjectModel; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/inference/proof/ProofStepClauseDemodulation.cs b/aima-csharp/logic/fol/inference/proof/ProofStepClauseDemodulation.cs index e14e47a..ebe0303 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofStepClauseDemodulation.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofStepClauseDemodulation.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; using System.Collections.ObjectModel; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/inference/proof/ProofStepClauseFactor.cs b/aima-csharp/logic/fol/inference/proof/ProofStepClauseFactor.cs index b985fca..b60fc5c 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofStepClauseFactor.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofStepClauseFactor.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; using System.Collections.ObjectModel; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/inference/proof/ProofStepClauseParamodulation.cs b/aima-csharp/logic/fol/inference/proof/ProofStepClauseParamodulation.cs index 8a10da6..58e708e 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofStepClauseParamodulation.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofStepClauseParamodulation.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; using System.Collections.ObjectModel; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/inference/proof/ProofStepFoChAlreadyAFact.cs b/aima-csharp/logic/fol/inference/proof/ProofStepFoChAlreadyAFact.cs index 44466ab..317ba30 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofStepFoChAlreadyAFact.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofStepFoChAlreadyAFact.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; using System.Collections.ObjectModel; using aima.core.logic.fol.kb.data; diff --git a/aima-csharp/logic/fol/inference/proof/ProofStepFoChAssertFact.cs b/aima-csharp/logic/fol/inference/proof/ProofStepFoChAssertFact.cs index 0df094c..36461f3 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofStepFoChAssertFact.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofStepFoChAssertFact.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; using System.Text; -using System.Linq; using System.Collections.ObjectModel; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/inference/proof/ProofStepGoal.cs b/aima-csharp/logic/fol/inference/proof/ProofStepGoal.cs index 7fefbb9..7a8a82d 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofStepGoal.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofStepGoal.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; namespace aima.core.logic.fol.inference.proof { diff --git a/aima-csharp/logic/fol/inference/proof/ProofStepPremise.cs b/aima-csharp/logic/fol/inference/proof/ProofStepPremise.cs index 856d67f..3105ec8 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofStepPremise.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofStepPremise.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; namespace aima.core.logic.fol.inference.proof { diff --git a/aima-csharp/logic/fol/inference/proof/ProofStepRenaming.cs b/aima-csharp/logic/fol/inference/proof/ProofStepRenaming.cs index 982bcc7..e3a0cf5 100644 --- a/aima-csharp/logic/fol/inference/proof/ProofStepRenaming.cs +++ b/aima-csharp/logic/fol/inference/proof/ProofStepRenaming.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; namespace aima.core.logic.fol.inference.proof { diff --git a/aima-csharp/logic/fol/inference/trace/FOLModelEliminationTracer.cs b/aima-csharp/logic/fol/inference/trace/FOLModelEliminationTracer.cs index 6d25163..f2c6296 100644 --- a/aima-csharp/logic/fol/inference/trace/FOLModelEliminationTracer.cs +++ b/aima-csharp/logic/fol/inference/trace/FOLModelEliminationTracer.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.logic.fol.inference.trace { /** diff --git a/aima-csharp/logic/fol/inference/trace/FOLTFMResolutiontracer.cs b/aima-csharp/logic/fol/inference/trace/FOLTFMResolutiontracer.cs index ae954d2..1534135 100644 --- a/aima-csharp/logic/fol/inference/trace/FOLTFMResolutiontracer.cs +++ b/aima-csharp/logic/fol/inference/trace/FOLTFMResolutiontracer.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using aima.core.logic.fol.inference; using aima.core.logic.fol.kb.data; namespace aima.core.logic.fol.inference.trace diff --git a/aima-csharp/logic/fol/kb/FOLKnowledgeBase.cs b/aima-csharp/logic/fol/kb/FOLKnowledgeBase.cs index 1440f5c..8f8506b 100644 --- a/aima-csharp/logic/fol/kb/FOLKnowledgeBase.cs +++ b/aima-csharp/logic/fol/kb/FOLKnowledgeBase.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; using System.Text; -using System.Linq; -using aima.core.logic.fol; using aima.core.logic.fol.inference; using aima.core.logic.fol.kb.data; using aima.core.logic.fol.parsing; diff --git a/aima-csharp/logic/fol/kb/FOLKnowledgeBaseFactory.cs b/aima-csharp/logic/fol/kb/FOLKnowledgeBaseFactory.cs index 88b7a79..9b764a6 100644 --- a/aima-csharp/logic/fol/kb/FOLKnowledgeBaseFactory.cs +++ b/aima-csharp/logic/fol/kb/FOLKnowledgeBaseFactory.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.domain; using aima.core.logic.fol.inference; diff --git a/aima-csharp/logic/fol/kb/data/CNF.cs b/aima-csharp/logic/fol/kb/data/CNF.cs index c451a3a..d0645af 100644 --- a/aima-csharp/logic/fol/kb/data/CNF.cs +++ b/aima-csharp/logic/fol/kb/data/CNF.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections; using System.Text; -using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; namespace aima.core.logic.fol.kb.data { diff --git a/aima-csharp/logic/fol/kb/data/Chain.cs b/aima-csharp/logic/fol/kb/data/Chain.cs index 768f36a..bb6125c 100644 --- a/aima-csharp/logic/fol/kb/data/Chain.cs +++ b/aima-csharp/logic/fol/kb/data/Chain.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; using System.Text; -using System.Linq; using System.Collections.ObjectModel; using aima.core.logic.fol.inference.proof; diff --git a/aima-csharp/logic/fol/kb/data/Clause.cs b/aima-csharp/logic/fol/kb/data/Clause.cs index 35591db..f7d8bae 100644 --- a/aima-csharp/logic/fol/kb/data/Clause.cs +++ b/aima-csharp/logic/fol/kb/data/Clause.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; using System.Text; using System.Collections.ObjectModel; -using System.Linq; -using aima.core.logic.fol; using aima.core.logic.fol.inference.proof; using aima.core.logic.fol.parsing; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/kb/data/Literal.cs b/aima-csharp/logic/fol/kb/data/Literal.cs index 526439c..302abe0 100644 --- a/aima-csharp/logic/fol/kb/data/Literal.cs +++ b/aima-csharp/logic/fol/kb/data/Literal.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections; using System.Text; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/kb/data/ReducedLiteral.cs b/aima-csharp/logic/fol/kb/data/ReducedLiteral.cs index 41b5f15..0aaa48c 100644 --- a/aima-csharp/logic/fol/kb/data/ReducedLiteral.cs +++ b/aima-csharp/logic/fol/kb/data/ReducedLiteral.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using System.Text; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/parsing/AbstractFOLVisitor.cs b/aima-csharp/logic/fol/parsing/AbstractFOLVisitor.cs index d60b6e2..5a72f02 100644 --- a/aima-csharp/logic/fol/parsing/AbstractFOLVisitor.cs +++ b/aima-csharp/logic/fol/parsing/AbstractFOLVisitor.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.parsing.ast; namespace aima.core.logic.fol.parsing diff --git a/aima-csharp/logic/fol/parsing/FOLLexer.cs b/aima-csharp/logic/fol/parsing/FOLLexer.cs index c398f3a..727898f 100644 --- a/aima-csharp/logic/fol/parsing/FOLLexer.cs +++ b/aima-csharp/logic/fol/parsing/FOLLexer.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; using System.Text; -using System.Text.RegularExpressions; using aima.core.logic.common; -using aima.core.logic.fol; using aima.core.logic.fol.domain; namespace aima.core.logic.fol.parsing diff --git a/aima-csharp/logic/fol/parsing/FOLParser.cs b/aima-csharp/logic/fol/parsing/FOLParser.cs index f0fc6b8..61400e1 100644 --- a/aima-csharp/logic/fol/parsing/FOLParser.cs +++ b/aima-csharp/logic/fol/parsing/FOLParser.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.common; using aima.core.logic.fol.domain; using aima.core.logic.fol.parsing.ast; diff --git a/aima-csharp/logic/fol/parsing/FOLVisitor.cs b/aima-csharp/logic/fol/parsing/FOLVisitor.cs index 2428a11..10def78 100644 --- a/aima-csharp/logic/fol/parsing/FOLVisitor.cs +++ b/aima-csharp/logic/fol/parsing/FOLVisitor.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.fol.parsing.ast; namespace aima.core.logic.fol.parsing diff --git a/aima-csharp/logic/fol/parsing/ast/AtomicSentence.cs b/aima-csharp/logic/fol/parsing/ast/AtomicSentence.cs index cd409cc..d9ba3e1 100644 --- a/aima-csharp/logic/fol/parsing/ast/AtomicSentence.cs +++ b/aima-csharp/logic/fol/parsing/ast/AtomicSentence.cs @@ -1,5 +1,3 @@ -using System.Collections.Generic; - namespace aima.core.logic.fol.parsing.ast { /** diff --git a/aima-csharp/logic/fol/parsing/ast/ConnectedSentence.cs b/aima-csharp/logic/fol/parsing/ast/ConnectedSentence.cs index d62c491..a4ee03b 100644 --- a/aima-csharp/logic/fol/parsing/ast/ConnectedSentence.cs +++ b/aima-csharp/logic/fol/parsing/ast/ConnectedSentence.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; using System.Text; -using aima.core.logic.fol.parsing; namespace aima.core.logic.fol.parsing.ast { diff --git a/aima-csharp/logic/fol/parsing/ast/Constant.cs b/aima-csharp/logic/fol/parsing/ast/Constant.cs index bd945d5..f7102d4 100644 --- a/aima-csharp/logic/fol/parsing/ast/Constant.cs +++ b/aima-csharp/logic/fol/parsing/ast/Constant.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using aima.core.logic.fol.parsing; - namespace aima.core.logic.fol.parsing.ast { /** diff --git a/aima-csharp/logic/fol/parsing/ast/FOLNode.cs b/aima-csharp/logic/fol/parsing/ast/FOLNode.cs index 5604606..b165842 100644 --- a/aima-csharp/logic/fol/parsing/ast/FOLNode.cs +++ b/aima-csharp/logic/fol/parsing/ast/FOLNode.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; using aima.core.logic.common; -using aima.core.logic.fol.parsing; namespace aima.core.logic.fol.parsing.ast { diff --git a/aima-csharp/logic/fol/parsing/ast/Function.cs b/aima-csharp/logic/fol/parsing/ast/Function.cs index be0bff1..33c04e6 100644 --- a/aima-csharp/logic/fol/parsing/ast/Function.cs +++ b/aima-csharp/logic/fol/parsing/ast/Function.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; using System.Text; -using aima.core.logic.fol.parsing; namespace aima.core.logic.fol.parsing.ast { diff --git a/aima-csharp/logic/fol/parsing/ast/NotSentence.cs b/aima-csharp/logic/fol/parsing/ast/NotSentence.cs index 6a9f9fa..3f9eab6 100644 --- a/aima-csharp/logic/fol/parsing/ast/NotSentence.cs +++ b/aima-csharp/logic/fol/parsing/ast/NotSentence.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; using System.Text; -using System.Linq; -using aima.core.logic.fol; -using aima.core.logic.fol.parsing; -using aima.core.logic.fol.inference.proof; using System.Collections.ObjectModel; namespace aima.core.logic.fol.parsing.ast diff --git a/aima-csharp/logic/fol/parsing/ast/Predicate.cs b/aima-csharp/logic/fol/parsing/ast/Predicate.cs index a1b2f12..7f1c50d 100644 --- a/aima-csharp/logic/fol/parsing/ast/Predicate.cs +++ b/aima-csharp/logic/fol/parsing/ast/Predicate.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; using System.Text; -using System.Linq; -using aima.core.logic.fol.parsing; namespace aima.core.logic.fol.parsing.ast { diff --git a/aima-csharp/logic/fol/parsing/ast/QuantifiedSentence.cs b/aima-csharp/logic/fol/parsing/ast/QuantifiedSentence.cs index 708c592..4a36755 100644 --- a/aima-csharp/logic/fol/parsing/ast/QuantifiedSentence.cs +++ b/aima-csharp/logic/fol/parsing/ast/QuantifiedSentence.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; using System.Text; -using System.Linq; using System.Collections.ObjectModel; -using aima.core.logic.fol.parsing; namespace aima.core.logic.fol.parsing.ast { diff --git a/aima-csharp/logic/fol/parsing/ast/Sentence.cs b/aima-csharp/logic/fol/parsing/ast/Sentence.cs index c40a4ce..6690602 100644 --- a/aima-csharp/logic/fol/parsing/ast/Sentence.cs +++ b/aima-csharp/logic/fol/parsing/ast/Sentence.cs @@ -1,5 +1,3 @@ -using System.Collections.Generic; - namespace aima.core.logic.fol.parsing.ast { /** diff --git a/aima-csharp/logic/fol/parsing/ast/Term.cs b/aima-csharp/logic/fol/parsing/ast/Term.cs index 86782d4..074c1d1 100644 --- a/aima-csharp/logic/fol/parsing/ast/Term.cs +++ b/aima-csharp/logic/fol/parsing/ast/Term.cs @@ -1,5 +1,3 @@ -using System.Collections.Generic; - namespace aima.core.logic.fol.parsing.ast { /** diff --git a/aima-csharp/logic/fol/parsing/ast/TermEquality.cs b/aima-csharp/logic/fol/parsing/ast/TermEquality.cs index 732f721..ccf6e73 100644 --- a/aima-csharp/logic/fol/parsing/ast/TermEquality.cs +++ b/aima-csharp/logic/fol/parsing/ast/TermEquality.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; using System.Text; -using System.Linq; using System.Collections.ObjectModel; -using aima.core.logic.fol.parsing; namespace aima.core.logic.fol.parsing.ast { diff --git a/aima-csharp/logic/fol/parsing/ast/Variable.cs b/aima-csharp/logic/fol/parsing/ast/Variable.cs index 502964a..17585ea 100644 --- a/aima-csharp/logic/fol/parsing/ast/Variable.cs +++ b/aima-csharp/logic/fol/parsing/ast/Variable.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using aima.core.logic.fol.parsing; - namespace aima.core.logic.fol.parsing.ast { /** diff --git a/aima-csharp/logic/propositional/agent/KBAgent.cs b/aima-csharp/logic/propositional/agent/KBAgent.cs index d34ba33..014f90c 100644 --- a/aima-csharp/logic/propositional/agent/KBAgent.cs +++ b/aima-csharp/logic/propositional/agent/KBAgent.cs @@ -42,12 +42,12 @@ public KBAgent(KnowledgeBase KB) } // function KB-AGENT(percept) returns an action - public override Action execute(Percept percept) + public override core.agent.Action execute(Percept percept) { // TELL(KB, MAKE-PERCEPT-SENTENCE(percept, t)) KB.tell(makePerceptSentence(percept, t)); // action <- ASK(KB, MAKE-ACTION-QUERY(t)) - Action action = ask(KB, makeActionQuery(t)); + core.agent.Action action = ask(KB, makeActionQuery(t)); // TELL(KB, MAKE-ACTION-SENTENCE(action, t)) KB.tell(makeActionSentence(action, t)); @@ -92,7 +92,7 @@ public override Action execute(Percept percept) * @return a sentence asserting that the chosen action was executed. */ // MAKE-ACTION-SENTENCE(action, t) - public abstract Sentence makeActionSentence(Action action, int t); + public abstract Sentence makeActionSentence(core.agent.Action action, int t); /** * A wrapper around the KB's ask() method which translates the action (in the form of @@ -106,6 +106,6 @@ public override Action execute(Percept percept) * @return the Action to be performed in response to the given query. */ // ASK(KB, MAKE-ACTION-QUERY(t)) - public abstract Action ask(KnowledgeBase KB, Sentence actionQuery); + public abstract core.agent.Action ask(KnowledgeBase KB, Sentence actionQuery); } } \ No newline at end of file diff --git a/aima-csharp/logic/propositional/kb/KnowledgeBase.cs b/aima-csharp/logic/propositional/kb/KnowledgeBase.cs index c2eac71..b4c4478 100644 --- a/aima-csharp/logic/propositional/kb/KnowledgeBase.cs +++ b/aima-csharp/logic/propositional/kb/KnowledgeBase.cs @@ -1,5 +1,4 @@ -using System; -using aima.core.logic.propositional.parsing.ast; +using aima.core.logic.propositional.parsing.ast; namespace aima.core.logic.propositional.kb { diff --git a/aima-csharp/logic/propositional/parsing/PLVisitor.cs b/aima-csharp/logic/propositional/parsing/PLVisitor.cs index bee9ed2..b5d345f 100644 --- a/aima-csharp/logic/propositional/parsing/PLVisitor.cs +++ b/aima-csharp/logic/propositional/parsing/PLVisitor.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.logic.propositional.parsing.ast; namespace aima.core.logic.propositional.parsing diff --git a/aima-csharp/logic/propositional/parsing/ast/AtomicSentence.cs b/aima-csharp/logic/propositional/parsing/ast/AtomicSentence.cs index 95ee7bf..5c23a07 100644 --- a/aima-csharp/logic/propositional/parsing/ast/AtomicSentence.cs +++ b/aima-csharp/logic/propositional/parsing/ast/AtomicSentence.cs @@ -1,5 +1,3 @@ -using System; - namespace aima.core.logic.propositional.parsing.ast { /** diff --git a/aima-csharp/logic/propositional/parsing/ast/ComplexSentence.cs b/aima-csharp/logic/propositional/parsing/ast/ComplexSentence.cs index 0831a32..6c783e3 100644 --- a/aima-csharp/logic/propositional/parsing/ast/ComplexSentence.cs +++ b/aima-csharp/logic/propositional/parsing/ast/ComplexSentence.cs @@ -1,7 +1,4 @@ -using aima.core.logic.propositional.parsing.ast; -using System; - -namespace aima.core.logic.propositional.parsing.ast +namespace aima.core.logic.propositional.parsing.ast { /** * Artificial Intelligence A Modern Approach (3rd Edition): page 244.
diff --git a/aima-csharp/logic/propositional/parsing/ast/Connective.cs b/aima-csharp/logic/propositional/parsing/ast/Connective.cs index 9d5261e..e7b8d6d 100644 --- a/aima-csharp/logic/propositional/parsing/ast/Connective.cs +++ b/aima-csharp/logic/propositional/parsing/ast/Connective.cs @@ -1,6 +1,4 @@ -using System; -using aima.core.util; -using System.Collections.Generic; +using aima.core.util; namespace aima.core.logic.propositional.parsing.ast { diff --git a/aima-csharp/logic/propositional/parsing/ast/PropositionSymbol.cs b/aima-csharp/logic/propositional/parsing/ast/PropositionSymbol.cs index 274a066..d16c7c4 100644 --- a/aima-csharp/logic/propositional/parsing/ast/PropositionSymbol.cs +++ b/aima-csharp/logic/propositional/parsing/ast/PropositionSymbol.cs @@ -1,5 +1,4 @@ -using System; -using System.CodeDom.Compiler; +using System.CodeDom.Compiler; namespace aima.core.logic.propositional.parsing.ast { diff --git a/aima-csharp/logic/propositional/parsing/ast/Sentence.cs b/aima-csharp/logic/propositional/parsing/ast/Sentence.cs index c5dffcb..60c5582 100644 --- a/aima-csharp/logic/propositional/parsing/ast/Sentence.cs +++ b/aima-csharp/logic/propositional/parsing/ast/Sentence.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using aima.core.logic.common; -using aima.core.logic.propositional.parsing; +using aima.core.logic.common; using aima.core.util; namespace aima.core.logic.propositional.parsing.ast diff --git a/aima-csharp/search/Local/Individual.cs b/aima-csharp/search/Local/Individual.cs index 65dea60..0c0c9da 100644 --- a/aima-csharp/search/Local/Individual.cs +++ b/aima-csharp/search/Local/Individual.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.search.local { /** @@ -16,7 +13,7 @@ namespace aima.core.search.local * individuals in the population (this is to provide flexibility in * terms of how a problem can be encoded). */ - public class Individual + public class Individual { private List representation = new List(); private int descendants; // for debugging diff --git a/aima-csharp/search/Local/Scheduler.cs b/aima-csharp/search/Local/Scheduler.cs index ecf105f..bb84f10 100644 --- a/aima-csharp/search/Local/Scheduler.cs +++ b/aima-csharp/search/Local/Scheduler.cs @@ -1,13 +1,10 @@ -using System; -using System.Collections.Generic; - namespace aima.core.search.local { /** * @author Ravi Mohan * */ - public class Scheduler + public class Scheduler { private int k, limit; private double lam; diff --git a/aima-csharp/search/framework/CutOffIndicatorAction.cs b/aima-csharp/search/framework/CutOffIndicatorAction.cs index dc3c650..7e539f3 100644 --- a/aima-csharp/search/framework/CutOffIndicatorAction.cs +++ b/aima-csharp/search/framework/CutOffIndicatorAction.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.agent.impl; namespace aima.core.search.framework diff --git a/aima-csharp/search/framework/EvaluationFunction.cs b/aima-csharp/search/framework/EvaluationFunction.cs index c8d1f45..5e929d3 100644 --- a/aima-csharp/search/framework/EvaluationFunction.cs +++ b/aima-csharp/search/framework/EvaluationFunction.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.search.framework { /** diff --git a/aima-csharp/search/framework/HeuristicFunction.cs b/aima-csharp/search/framework/HeuristicFunction.cs index f5c8da8..1067437 100644 --- a/aima-csharp/search/framework/HeuristicFunction.cs +++ b/aima-csharp/search/framework/HeuristicFunction.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.search.framework { /** @@ -16,7 +13,7 @@ namespace aima.core.search.framework * @author Ravi Mohan * */ - public interface HeuristicFunction + public interface HeuristicFunction { double h(Object state); } diff --git a/aima-csharp/search/framework/Metrics.cs b/aima-csharp/search/framework/Metrics.cs index 206bd09..bf83006 100644 --- a/aima-csharp/search/framework/Metrics.cs +++ b/aima-csharp/search/framework/Metrics.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.search.framework { /** @@ -9,7 +6,7 @@ namespace aima.core.search.framework * @author Ravi Mohan * @author Ruediger Lunde */ - public class Metrics + public class Metrics { private Dictionary hash; diff --git a/aima-csharp/search/framework/Node.cs b/aima-csharp/search/framework/Node.cs index 1cb7fb0..e44a99c 100644 --- a/aima-csharp/search/framework/Node.cs +++ b/aima-csharp/search/framework/Node.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; using Action = aima.core.agent.Action; namespace aima.core.search.framework @@ -55,12 +52,12 @@ public Node(object state) } /// - /// Creates a new instance of with the specified state, parent, action, and step cost. + /// Creates a new instance of with the specified state, parent, agent.Action, and step cost. /// /// The step cost is the cost from the parent node to this node. /// /// - public Node(object state, Node parent, Action action, double stepCost) : this(state) + public Node(object state, Node parent, agent.Action action, double stepCost) : this(state) { if (parent == null) { diff --git a/aima-csharp/search/framework/NodeExpander.cs b/aima-csharp/search/framework/NodeExpander.cs index 72f90c6..618c15d 100644 --- a/aima-csharp/search/framework/NodeExpander.cs +++ b/aima-csharp/search/framework/NodeExpander.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using aima.core.agent; using aima.core.search.framework.problem; @@ -26,7 +25,7 @@ public Node createRootNode(System.Object state) * parent node state to the specified state, creates a new node for the * specified state, adds it as child of the provided parent, and returns it. */ - public Node createNode(System.Object state, Node parent, Action action, double stepCost) + public Node createNode(System.Object state, Node parent, agent.Action action, double stepCost) { return new Node(state, parent, action, parent.PathCost + stepCost); } @@ -51,7 +50,7 @@ public List expand(Node node, Problem problem) ResultFunction resultFunction = problem.getResultFunction(); StepCostFunction stepCostFunction = problem.getStepCostFunction(); - foreach (Action action in actionsFunction.actions(node.State)) + foreach (agent.Action action in actionsFunction.actions(node.State)) { System.Object successorState = resultFunction.result(node.State, action); diff --git a/aima-csharp/search/framework/PathCostFunction.cs b/aima-csharp/search/framework/PathCostFunction.cs index 1fbec80..a598cc5 100644 --- a/aima-csharp/search/framework/PathCostFunction.cs +++ b/aima-csharp/search/framework/PathCostFunction.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; - namespace aima.core.search.framework -{ +{ /** * Artificial Intelligence A Modern Approach (3rd Edition): page 78.
*
diff --git a/aima-csharp/search/framework/PerceptToStateFunction.cs b/aima-csharp/search/framework/PerceptToStateFunction.cs index a104541..58ae67e 100644 --- a/aima-csharp/search/framework/PerceptToStateFunction.cs +++ b/aima-csharp/search/framework/PerceptToStateFunction.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using aima.core.agent; namespace aima.core.search.framework @@ -12,7 +10,7 @@ namespace aima.core.search.framework * @author Ciaran O'Reilly * */ - public interface PerceptToStateFunction + public interface PerceptToStateFunction { /** * Get the problem state associated with a Percept. diff --git a/aima-csharp/search/framework/Search.cs b/aima-csharp/search/framework/Search.cs index 773915a..e981d1c 100644 --- a/aima-csharp/search/framework/Search.cs +++ b/aima-csharp/search/framework/Search.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using aima.core.agent; using aima.core.search.framework.problem; @@ -23,7 +22,7 @@ public interface Search * containing a single NoOp Action if already at the goal, or an * empty list if the goal could not be found. */ - List search(Problem p); + List search(Problem p); /** * Returns all the metrics of the search. diff --git a/aima-csharp/search/framework/SearchAgent.cs b/aima-csharp/search/framework/SearchAgent.cs index e64b7f6..0841fd5 100644 --- a/aima-csharp/search/framework/SearchAgent.cs +++ b/aima-csharp/search/framework/SearchAgent.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using aima.core.agent; using aima.core.agent.impl; using aima.core.search.framework.problem; @@ -9,11 +8,11 @@ namespace aima.core.search.framework * @author Ravi Mohan * */ - public class SearchAgent : AbstractAgent + public class SearchAgent : AbstractAgent { - protected List actionList; + protected List actionList; - private List.Enumerator actionIterator; + private List.Enumerator actionIterator; private Metrics searchMetrics; @@ -24,7 +23,7 @@ public SearchAgent(Problem p, Search search) searchMetrics = search.getMetrics(); } - public override Action execute(Percept p) + public override core.agent.Action execute(Percept p) { if (actionIterator.MoveNext()) @@ -42,7 +41,7 @@ public bool isDone() return null != actionIterator.Current; } - public List getActions() + public List getActions() { return actionList; } diff --git a/aima-csharp/search/framework/SearchForActions.cs b/aima-csharp/search/framework/SearchForActions.cs index d09f95d..39d65f4 100644 --- a/aima-csharp/search/framework/SearchForActions.cs +++ b/aima-csharp/search/framework/SearchForActions.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using aima.core.agent; - namespace aima.core.search.framework { /** diff --git a/aima-csharp/search/framework/SearchUtils.cs b/aima-csharp/search/framework/SearchUtils.cs index 758641f..d58894c 100644 --- a/aima-csharp/search/framework/SearchUtils.cs +++ b/aima-csharp/search/framework/SearchUtils.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using aima.core.agent; using aima.core.agent.impl; using aima.core.search.framework.problem; @@ -12,16 +11,16 @@ namespace aima.core.search.framework * @author Ruediger Lunde * */ - public class SearchUtils + public class SearchUtils { /** * Returns the list of actions corresponding to the complete path to the * given node or NoOp if path length is one. */ - public static List getSequenceOfActions(Node node) + public static List getSequenceOfActions(Node node) { List nodes = node.GetPathFromRoot(); - List actions = new List(); + List actions = new List(); if(nodes.Count == 1) { @@ -43,13 +42,13 @@ public static List getSequenceOfActions(Node node) } /** Returns an empty action list. */ - public static List failure() + public static List failure() { - return new List(); + return new List(); } /** Checks whether a list of actions is empty. */ - public static bool isFailure(List actions) + public static bool isFailure(List actions) { if(actions.Count == 0) { diff --git a/aima-csharp/search/framework/SimpleProblemSolvingAgent.cs b/aima-csharp/search/framework/SimpleProblemSolvingAgent.cs index b46abbf..b37d511 100644 --- a/aima-csharp/search/framework/SimpleProblemSolvingAgent.cs +++ b/aima-csharp/search/framework/SimpleProblemSolvingAgent.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using aima.core.agent; using aima.core.agent.impl; using aima.core.util; @@ -36,11 +35,11 @@ namespace aima.core.search.framework * @author Ciaran O'Reilly * @author Mike Stampone */ - public abstract class SimpleProblemSolvingAgent : AbstractAgent + public abstract class SimpleProblemSolvingAgent : AbstractAgent { // seq, an action sequence, initially empty - private List seq = new List(); + private List seq = new List(); // private bool formulateGoalsIndefinitely = true; @@ -72,9 +71,9 @@ public SimpleProblemSolvingAgent(int maxGoalsToFormulate) } // function SIMPLE-PROBLEM-SOLVING-AGENT(percept) returns an action - public override Action execute(Percept p) + public override core.agent.Action execute(Percept p) { - Action action = NoOpAction.NO_OP; + agent.Action action = NoOpAction.NO_OP; // state <- UPDATE-STATE(state, percept) updateState(p); @@ -129,7 +128,7 @@ public override Action execute(Percept p) protected abstract Problem formulateProblem(System.Object goal); - protected abstract List search(Problem problem); + protected abstract List search(Problem problem); protected abstract void notifyViewOfMetrics(); } diff --git a/aima-csharp/search/framework/SolutionChecker.cs b/aima-csharp/search/framework/SolutionChecker.cs index ca40e9e..fdb5357 100644 --- a/aima-csharp/search/framework/SolutionChecker.cs +++ b/aima-csharp/search/framework/SolutionChecker.cs @@ -1,9 +1,8 @@ -using System.Collections.Generic; using aima.core.agent; using aima.core.search.framework.problem; namespace aima.core.search.framework -{ +{ /** * A specialization of the GoalTest interface so that it is possible to check * the solution once a Goal has been identified to determine if it is @@ -30,6 +29,6 @@ public interface SolutionChecker : GoalTest * @return true if the solution is acceptable, false otherwise, which * indicates the search should be continued. */ - bool isAcceptableSolution(List actions, System.Object goal); + bool isAcceptableSolution(List actions, System.Object goal); } } \ No newline at end of file diff --git a/aima-csharp/search/framework/problem/ActionsFunction.cs b/aima-csharp/search/framework/problem/ActionsFunction.cs index 7ce6bb1..4269895 100644 --- a/aima-csharp/search/framework/problem/ActionsFunction.cs +++ b/aima-csharp/search/framework/problem/ActionsFunction.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using aima.core.agent; namespace aima.core.search.framework.problem @@ -22,6 +21,6 @@ public interface ActionsFunction * a particular state. * @return the set of actions that can be executed in s. */ - HashSet actions(System.Object s); + HashSet actions(System.Object s); } } \ No newline at end of file diff --git a/aima-csharp/search/framework/problem/BidirectionalProblem.cs b/aima-csharp/search/framework/problem/BidirectionalProblem.cs index 5818559..21fa0b7 100644 --- a/aima-csharp/search/framework/problem/BidirectionalProblem.cs +++ b/aima-csharp/search/framework/problem/BidirectionalProblem.cs @@ -1,5 +1,3 @@ -using System.Collections.Generic; - namespace aima.core.search.framework.problem { /** diff --git a/aima-csharp/search/framework/problem/DefaultGoalTest.cs b/aima-csharp/search/framework/problem/DefaultGoalTest.cs index f91f83b..dde9bf3 100644 --- a/aima-csharp/search/framework/problem/DefaultGoalTest.cs +++ b/aima-csharp/search/framework/problem/DefaultGoalTest.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.search.framework.problem { /** diff --git a/aima-csharp/search/framework/problem/DefaultStepCostFunction.cs b/aima-csharp/search/framework/problem/DefaultStepCostFunction.cs index 192509e..6f570d7 100644 --- a/aima-csharp/search/framework/problem/DefaultStepCostFunction.cs +++ b/aima-csharp/search/framework/problem/DefaultStepCostFunction.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using aima.core.agent; namespace aima.core.search.framework.problem @@ -12,7 +11,7 @@ public class DefaultStepCostFunction : StepCostFunction { - public double c(System.Object stateFrom, Action action, System.Object stateTo) + public double c(System.Object stateFrom, agent.Action action, System.Object stateTo) { return 1; } diff --git a/aima-csharp/search/framework/problem/GoalTest.cs b/aima-csharp/search/framework/problem/GoalTest.cs index 4492edf..ecd02a3 100644 --- a/aima-csharp/search/framework/problem/GoalTest.cs +++ b/aima-csharp/search/framework/problem/GoalTest.cs @@ -1,5 +1,3 @@ -using System.Collections.Generic; - namespace aima.core.search.framework.problem { /** diff --git a/aima-csharp/search/framework/problem/Problem.cs b/aima-csharp/search/framework/problem/Problem.cs index c77ba4e..d795d29 100644 --- a/aima-csharp/search/framework/problem/Problem.cs +++ b/aima-csharp/search/framework/problem/Problem.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.search.framework.problem { /** diff --git a/aima-csharp/search/framework/problem/ResultFunction.cs b/aima-csharp/search/framework/problem/ResultFunction.cs index c7ed919..365e72b 100644 --- a/aima-csharp/search/framework/problem/ResultFunction.cs +++ b/aima-csharp/search/framework/problem/ResultFunction.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using aima.core.agent; namespace aima.core.search.framework.problem @@ -25,6 +24,6 @@ public interface ResultFunction * an action to be performed in state s. * @return the state that results from doing action a in state s. */ - System.Object result(System.Object s, Action a); + System.Object result(System.Object s, agent.Action a); } } \ No newline at end of file diff --git a/aima-csharp/search/framework/problem/StepCostFunction.cs b/aima-csharp/search/framework/problem/StepCostFunction.cs index 299b1dd..34262b3 100644 --- a/aima-csharp/search/framework/problem/StepCostFunction.cs +++ b/aima-csharp/search/framework/problem/StepCostFunction.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using aima.core.agent; namespace aima.core.search.framework.problem { @@ -25,6 +24,6 @@ public interface StepCostFunction * the state reached by taking the action. * @return the cost of taking action a in state s to reach state s'. */ - double c(System.Object s, Action a, System.Object sDelta); + double c(System.Object s, agent.Action a, System.Object sDelta); } } \ No newline at end of file diff --git a/aima-csharp/search/framework/qsearch/GraphSearch.cs b/aima-csharp/search/framework/qsearch/GraphSearch.cs index 4a8cf84..a1a83fa 100644 --- a/aima-csharp/search/framework/qsearch/GraphSearch.cs +++ b/aima-csharp/search/framework/qsearch/GraphSearch.cs @@ -1,7 +1,4 @@ -using System.Collections.Generic; -using System.Linq; using aima.core.agent; -using aima.core.search.framework; using aima.core.search.framework.problem; namespace aima.core.search.framework.qsearch @@ -55,7 +52,7 @@ public GraphSearch(NodeExpander nodeExpander): base(nodeExpander) * Clears the set of explored states and calls the search implementation of * QueSearch */ - public override List search(Problem problem, Queue frontier) + public override List search(Problem problem, Queue frontier) { // initialize the explored set to be empty explored.Clear(); diff --git a/aima-csharp/search/framework/qsearch/GraphSearchBFS.cs b/aima-csharp/search/framework/qsearch/GraphSearchBFS.cs index ba148e7..4529de4 100644 --- a/aima-csharp/search/framework/qsearch/GraphSearchBFS.cs +++ b/aima-csharp/search/framework/qsearch/GraphSearchBFS.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; using aima.core.agent; -using aima.core.search.framework; using aima.core.search.framework.problem; namespace aima.core.search.framework.qsearch @@ -53,7 +51,7 @@ public GraphSearchBFS(NodeExpander nodeExpander) : base(nodeExpander) * Clears the set of explored states and calls the search implementation of * QueSearch */ - public override List search(Problem problem, Queue frontier) + public override List search(Problem problem, Queue frontier) { // Initialize the explored set to be empty explored.Clear(); diff --git a/aima-csharp/search/framework/qsearch/QueueSearch.cs b/aima-csharp/search/framework/qsearch/QueueSearch.cs index 9c07f83..f03d89f 100644 --- a/aima-csharp/search/framework/qsearch/QueueSearch.cs +++ b/aima-csharp/search/framework/qsearch/QueueSearch.cs @@ -1,7 +1,4 @@ -using System.Collections.Generic; -using System.Threading; using aima.core.agent; -using aima.core.util; using aima.core.search.framework.problem; namespace aima.core.search.framework.qsearch @@ -15,7 +12,7 @@ namespace aima.core.search.framework.qsearch * @author Mike Stampone * @author Ruediger Lunde */ - public abstract class QueueSearch + public abstract class QueueSearch { public const System.String METRIC_NODES_EXPANDED = "nodesExpanded"; public const System.String METRIC_QUEUE_SIZE = "queueSize"; @@ -54,7 +51,7 @@ public virtual NodeExpander getNodeExpander() * containing a single NoOp Action if already at the goal, or an * empty list if the goal could not be found. */ - public virtual List search(Problem problem, Queue frontier) + public virtual List search(Problem problem, Queue frontier) { this.frontier = frontier; clearInstrumentation(); @@ -161,7 +158,7 @@ protected void updateMetrics(int queueSize) } } - private List getSolution(Node node) + private List getSolution(Node node) { metrics.set(METRIC_PATH_COST, node.PathCost); return SearchUtils.getSequenceOfActions(node); diff --git a/aima-csharp/search/framework/qsearch/TreeSearch.cs b/aima-csharp/search/framework/qsearch/TreeSearch.cs index 8858087..918fdee 100644 --- a/aima-csharp/search/framework/qsearch/TreeSearch.cs +++ b/aima-csharp/search/framework/qsearch/TreeSearch.cs @@ -1,7 +1,3 @@ -using System.Collections.Generic; -using aima.core.search.framework; -using aima.core.search.framework.problem; - namespace aima.core.search.framework.qsearch { /** @@ -29,7 +25,7 @@ namespace aima.core.search.framework.qsearch * @author Ruediger Lunde * */ - public class TreeSearch : QueueSearch + public class TreeSearch : QueueSearch { public TreeSearch(): this(new NodeExpander()) { diff --git a/aima-csharp/search/online/LRTAStarAgent.cs b/aima-csharp/search/online/LRTAStarAgent.cs index 1b67681..239b8c3 100644 --- a/aima-csharp/search/online/LRTAStarAgent.cs +++ b/aima-csharp/search/online/LRTAStarAgent.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using aima.core.agent; using aima.core.agent.impl; using aima.core.search.framework; @@ -50,12 +49,12 @@ public class LRTAStarAgent : AbstractAgent private PerceptToStateFunction ptsFunction; private HeuristicFunction hf; // persistent: result, a table, indexed by state and action, initially empty - private readonly TwoKeyHashMap result = new TwoKeyHashMap(); + private readonly TwoKeyHashMap result = new TwoKeyHashMap(); // H, a table of cost estimates indexed by state, initially empty private readonly Dictionary H = new Dictionary(); // s, a, the previous state and action, initially null private object s = null; - private Action a = null; + private agent.Action a = null; /** * Constructs a LRTA* agent with the specified search problem, percept to @@ -146,7 +145,7 @@ public void setHeuristicFunction(HeuristicFunction hf) // function LRTA*-AGENT(s') returns an action // inputs: s', a percept that identifies the current state - public override Action execute(Percept psDelta) + public override core.agent.Action execute(Percept psDelta) { object sDelta = ptsFunction.getState(psDelta); // if GOAL-TEST(s') then return stop @@ -170,7 +169,7 @@ public override Action execute(Percept psDelta) // H[s] <- min LRTA*-COST(s, b, result[s, b], H) // b (element of) ACTIONS(s) double minimum = double.MaxValue; - foreach(Action b in actions(s)) + foreach(agent.Action b in actions(s)) { double cost = lrtaCost(s, b, result.get(s, b)); if(cost < minimum) @@ -226,7 +225,7 @@ private bool goalTest(object state) } // function LRTA*-COST(s, a, s', H) returns a cost estimate - private double lrtaCost(object s, Action action, object sDelta) + private double lrtaCost(object s, agent.Action action, object sDelta) { // if s' is undefined then return h(s) if (null == sDelta) @@ -238,7 +237,7 @@ private double lrtaCost(object s, Action action, object sDelta) + H[sDelta]; } - private HashSet actions(object state) + private HashSet actions(object state) { return problem.getActionsFunction().actions(state); } diff --git a/aima-csharp/search/online/OnlineDFSAgent.cs b/aima-csharp/search/online/OnlineDFSAgent.cs index 509e4fc..e3cc223 100644 --- a/aima-csharp/search/online/OnlineDFSAgent.cs +++ b/aima-csharp/search/online/OnlineDFSAgent.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using aima.core.agent; using aima.core.agent.impl; using aima.core.search.framework; @@ -43,15 +42,15 @@ public class OnlineDFSAgent : AbstractAgent { private OnlineSearchProblem problem; private PerceptToStateFunction ptsFunction; - private readonly TwoKeyHashMap result = new TwoKeyHashMap(); + private readonly TwoKeyHashMap result = new TwoKeyHashMap(); // untried, a table that lists, for each state, the actions not yet tried - private readonly Dictionary> untried = new Dictionary>(); + private readonly Dictionary> untried = new Dictionary>(); // unbacktracked, a table that lists, // for each state, the backtracks not yet tried private readonly Dictionary> unbacktracked = new Dictionary>(); // s, a, the previous state and action, initially null private object s = null; - private Action a = null; + private agent.Action a = null; /** * Constructs an online DFS agent with the specified search problem and @@ -116,7 +115,7 @@ public void setPerceptToStateFunction(PerceptToStateFunction ptsFunction) // function ONLINE-DFS-AGENT(s') returns an action // inputs: s', a percept that identifies the current state - public override Action execute(Percept psDelta) + public override core.agent.Action execute(Percept psDelta) { object sDelta = ptsFunction.getState(psDelta); // if GOAL-TEST(s') then return stop @@ -169,7 +168,7 @@ public override Action execute(Percept psDelta) // else a <- an action b such that result[s', b] = // POP(unbacktracked[s']) object popped = unbacktracked[sDelta].Remove(0); - foreach(Pair sa in result.Keys) + foreach(Pair sa in result.Keys) { if (sa.getFirst().Equals(sDelta) && result[sa].Equals(popped)) { @@ -216,9 +215,9 @@ private bool goalTest(object state) return getProblem().isGoalState(state); } - private List actions(object state) + private List actions(object state) { - return new List(problem.getActionsFunction() + return new List(problem.getActionsFunction() .actions(state)); } } diff --git a/aima-csharp/search/online/OnlineSearchProblem.cs b/aima-csharp/search/online/OnlineSearchProblem.cs index 43de07c..3dd4012 100644 --- a/aima-csharp/search/online/OnlineSearchProblem.cs +++ b/aima-csharp/search/online/OnlineSearchProblem.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; -using aima.core.search.framework; using aima.core.search.framework.problem; namespace aima.core.search.online diff --git a/aima-csharp/util/ArrayIterator.cs b/aima-csharp/util/ArrayIterator.cs index 7a05177..152b954 100644 --- a/aima-csharp/util/ArrayIterator.cs +++ b/aima-csharp/util/ArrayIterator.cs @@ -1,6 +1,4 @@ -using System; using System.Collections; -using System.Collections.Generic; namespace aima.core.util { diff --git a/aima-csharp/util/CSharpRandomizer.cs b/aima-csharp/util/CSharpRandomizer.cs index 61540c1..7e8d708 100644 --- a/aima-csharp/util/CSharpRandomizer.cs +++ b/aima-csharp/util/CSharpRandomizer.cs @@ -1,6 +1,3 @@ -using System.Collections.Generic; -using System; - namespace aima.core.util { /** diff --git a/aima-csharp/util/DisjointSets.cs b/aima-csharp/util/DisjointSets.cs index 7997685..22c0385 100644 --- a/aima-csharp/util/DisjointSets.cs +++ b/aima-csharp/util/DisjointSets.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; - namespace aima.core.util { /** diff --git a/aima-csharp/util/FrequencyCounter.cs b/aima-csharp/util/FrequencyCounter.cs index 133b677..0115415 100644 --- a/aima-csharp/util/FrequencyCounter.cs +++ b/aima-csharp/util/FrequencyCounter.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.util { /** diff --git a/aima-csharp/util/Interval.cs b/aima-csharp/util/Interval.cs index 67d3ae1..f56187d 100644 --- a/aima-csharp/util/Interval.cs +++ b/aima-csharp/util/Interval.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.util { /** diff --git a/aima-csharp/util/LUDecomposition.cs b/aima-csharp/util/LUDecomposition.cs index 41f3db7..7f59469 100644 --- a/aima-csharp/util/LUDecomposition.cs +++ b/aima-csharp/util/LUDecomposition.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.util { /** @@ -16,7 +13,7 @@ namespace aima.core.util * decomposition is in the solution of square systems of simultaneous linear * equations. This will fail if isNonsingular() returns false. */ - public class LUDecomposition + public class LUDecomposition { private const long serialVersionUID = 1L; diff --git a/aima-csharp/util/LabeledGraph.cs b/aima-csharp/util/LabeledGraph.cs index 4e88b5a..a801460 100644 --- a/aima-csharp/util/LabeledGraph.cs +++ b/aima-csharp/util/LabeledGraph.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.util { /** diff --git a/aima-csharp/util/LinkedHashSet.cs b/aima-csharp/util/LinkedHashSet.cs index b54480b..fc86e1e 100644 --- a/aima-csharp/util/LinkedHashSet.cs +++ b/aima-csharp/util/LinkedHashSet.cs @@ -1,6 +1,4 @@ -using System; using System.Collections; -using System.Collections.Generic; namespace aima.core.util { diff --git a/aima-csharp/util/Matrix.cs b/aima-csharp/util/Matrix.cs index 74ae84b..dd2eabf 100644 --- a/aima-csharp/util/Matrix.cs +++ b/aima-csharp/util/Matrix.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; using System.Text; -using System.IO; namespace aima.core.util { diff --git a/aima-csharp/util/MixedRadixNumber.cs b/aima-csharp/util/MixedRadixNumber.cs index 27492d5..6d3429f 100644 --- a/aima-csharp/util/MixedRadixNumber.cs +++ b/aima-csharp/util/MixedRadixNumber.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.util { /** diff --git a/aima-csharp/util/MockRandomizer.cs b/aima-csharp/util/MockRandomizer.cs index 254f0a7..00c32b8 100644 --- a/aima-csharp/util/MockRandomizer.cs +++ b/aima-csharp/util/MockRandomizer.cs @@ -1,5 +1,3 @@ -using System; - namespace aima.core.util { /** diff --git a/aima-csharp/util/Pair.cs b/aima-csharp/util/Pair.cs index e3fc44a..3f72e3d 100644 --- a/aima-csharp/util/Pair.cs +++ b/aima-csharp/util/Pair.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.util { /** diff --git a/aima-csharp/util/Point2D.cs b/aima-csharp/util/Point2D.cs index 908b9ee..a5fc831 100644 --- a/aima-csharp/util/Point2D.cs +++ b/aima-csharp/util/Point2D.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.util { /** diff --git a/aima-csharp/util/SetOps.cs b/aima-csharp/util/SetOps.cs index 9894155..5a792c2 100644 --- a/aima-csharp/util/SetOps.cs +++ b/aima-csharp/util/SetOps.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; - namespace aima.core.util { /** diff --git a/aima-csharp/util/Table.cs b/aima-csharp/util/Table.cs index 277e229..beaf61d 100644 --- a/aima-csharp/util/Table.cs +++ b/aima-csharp/util/Table.cs @@ -1,4 +1,3 @@ -using System.Collections.Generic; using System.Text; namespace aima.core.util diff --git a/aima-csharp/util/Triplet.cs b/aima-csharp/util/Triplet.cs index b44967b..0090ad1 100644 --- a/aima-csharp/util/Triplet.cs +++ b/aima-csharp/util/Triplet.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.util { /** @@ -8,7 +5,7 @@ namespace aima.core.util * @author Mike Stampone * */ - public class Triplet + public class Triplet { private X x; diff --git a/aima-csharp/util/TwoKeyHashMap.cs b/aima-csharp/util/TwoKeyHashMap.cs index fa4f201..332929f 100644 --- a/aima-csharp/util/TwoKeyHashMap.cs +++ b/aima-csharp/util/TwoKeyHashMap.cs @@ -1,5 +1,3 @@ -using System.Collections.Generic; - namespace aima.core.util { /** diff --git a/aima-csharp/util/Util.cs b/aima-csharp/util/Util.cs index b78e230..174b6a4 100644 --- a/aima-csharp/util/Util.cs +++ b/aima-csharp/util/Util.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Text; namespace aima.core.util { diff --git a/aima-csharp/util/Vector.cs b/aima-csharp/util/Vector.cs index 9a7e202..48cd373 100644 --- a/aima-csharp/util/Vector.cs +++ b/aima-csharp/util/Vector.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.util { /** diff --git a/aima-csharp/util/XYLocation.cs b/aima-csharp/util/XYLocation.cs index 223fc73..55d25b4 100644 --- a/aima-csharp/util/XYLocation.cs +++ b/aima-csharp/util/XYLocation.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections.Generic; - namespace aima.core.util { /**