Code cleanup

kris701 · May 13, 2024 · 4e31981 · 4e31981
1 parent cff00f2
commit 4e31981
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 46 deletions.
diff --git a/FlashPlanner.CLI/Program.cs b/FlashPlanner.CLI/Program.cs
@@ -1,6 +1,5 @@
 using CommandLine;
 using CommandLine.Text;
-using FlashPlanner.Translators;
 using PDDLSharp.CodeGenerators.FastDownward.Plans;
 using PDDLSharp.ErrorListeners;
 using PDDLSharp.Models.PDDL;
@@ -25,12 +24,16 @@ private static void Main(string[] args)
         public static void Run(Options opts)
         {
             WriteLineColor("Initializing", ConsoleColor.Blue);
-            WriteLineColor($"\tSearch Arguments:      {opts.SearchOption}");
+            WriteLineColor($"\tSearch Arguments:        {opts.SearchOption}");
             if (opts.SearchTimeLimit > 0)
-                WriteLineColor($"\tSearch Time limit:     {opts.SearchTimeLimit}s");
-            WriteLineColor($"\tTranslation Arguments: {opts.TranslatorOption}");
+                WriteLineColor($"\tSearch Time limit:       {opts.SearchTimeLimit}s");
+            if (opts.SearchMemoryLimit > 0)
+                WriteLineColor($"\tSearch Memory limit:     {opts.SearchMemoryLimit}MB");
+            WriteLineColor($"\tTranslation Arguments:   {opts.TranslatorOption}");
             if (opts.TranslatorTimeLimit > 0)
-                WriteLineColor($"\tTranslation Time limit:{opts.TranslatorTimeLimit}s");
+                WriteLineColor($"\tTranslation Time limit:  {opts.TranslatorTimeLimit}s");
+            if (opts.TranslatorMemoryLimit > 0)
+                WriteLineColor($"\tTranslation Memory limit:{opts.TranslatorMemoryLimit}MB");
 
             WriteColor("\tChecking Files...");
             opts.DomainPath = RootPath(opts.DomainPath);

diff --git a/FlashPlanner.CLI/Properties/launchSettings.json b/FlashPlanner.CLI/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "FlashPlanner.CLI": {
       "commandName": "Project",
-      "commandLineArgs": "--domain ../../../../Dependencies/downward-benchmarks/pathways/domain_p05.pddl --problem ../../../../Dependencies/downward-benchmarks/pathways/p05.pddl --search \"greedy(hGoal())\" --search-time-limit 10"
+      "commandLineArgs": "--domain ../../../../Dependencies/downward-benchmarks/logistics98/domain.pddl --problem ../../../../Dependencies/downward-benchmarks/logistics98/prob10.pddl --search \"greedy(hGoal())\" --search-time-limit 10"
     }
   }
 }
diff --git a/FlashPlanner/FlashPlanner.csproj b/FlashPlanner/FlashPlanner.csproj
@@ -15,7 +15,7 @@
 
 	<PropertyGroup>
 		<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-		<Version>1.0.15</Version>
+		<Version>1.0.16</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

diff --git a/FlashPlanner/Helpers/MemoryHelper.cs b/FlashPlanner/Helpers/MemoryHelper.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Diagnostics;
 
 namespace FlashPlanner.Helpers
 {

diff --git a/FlashPlanner/ILimitedComponent.cs b/FlashPlanner/ILimitedComponent.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static FlashPlanner.LimitedComponent;
-
-namespace FlashPlanner
+namespace FlashPlanner
 {
     public interface ILimitedComponent
     {

diff --git a/FlashPlanner/LimitedComponent.cs b/FlashPlanner/LimitedComponent.cs
@@ -1,12 +1,5 @@
 using FlashPlanner.Helpers;
-using FlashPlanner.Translators.Components;
-using PDDLSharp.Translators.Grounders;
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Timers;
 
 namespace FlashPlanner
@@ -38,9 +31,9 @@ public abstract class LimitedComponent : ILimitedComponent
         /// </summary>
         public bool Abort { get; set; }
 
-        private System.Timers.Timer _timeoutTimer = new System.Timers.Timer();
-        private System.Timers.Timer _memoryTimer = new System.Timers.Timer();
-        private Stopwatch _executionTime = new Stopwatch();
+        private readonly System.Timers.Timer _timeoutTimer = new System.Timers.Timer();
+        private readonly System.Timers.Timer _memoryTimer = new System.Timers.Timer();
+        private readonly Stopwatch _executionTime = new Stopwatch();
 
         public void Start()
         {

diff --git a/FlashPlanner/Search/Classical/BaseClassicalSearch.cs b/FlashPlanner/Search/Classical/BaseClassicalSearch.cs
@@ -3,8 +3,6 @@
 using FlashPlanner.Tools;
 using PDDLSharp.Models.FastDownward.Plans;
 using PDDLSharp.Models.SAS;
-using System.Diagnostics;
-using System.Timers;
 
 namespace FlashPlanner.Search.Classical
 {

diff --git a/FlashPlanner/Translators/PDDLToSASTranslator.cs b/FlashPlanner/Translators/PDDLToSASTranslator.cs
@@ -1,5 +1,4 @@
-using FlashPlanner.Helpers;
-using FlashPlanner.Translators.Components;
+using FlashPlanner.Translators.Components;
 using FlashPlanner.Translators.Exceptions;
 using PDDLSharp.Contextualisers.PDDL;
 using PDDLSharp.ErrorListeners;
@@ -10,9 +9,6 @@
 using PDDLSharp.Models.PDDL.Problem;
 using PDDLSharp.Models.SAS;
 using PDDLSharp.Translators.Grounders;
-using System.Diagnostics;
-using System.Timers;
-using static FlashPlanner.Translators.ITranslator;
 
 namespace FlashPlanner.Translators
 {
@@ -93,7 +89,7 @@ public SASDecl Translate(PDDLDecl from)
 
             if (from.Domain.Predicates != null)
             {
-                foreach(var pred in from.Domain.Predicates.Predicates)
+                foreach (var pred in from.Domain.Predicates.Predicates)
                 {
                     _factSet.Add(pred.Name, new List<Fact>());
                     _negativeFacts.Add(pred.Name, new List<Fact>());

diff --git a/FlashPlanner/Translators/ReachabilityChecker.cs b/FlashPlanner/Translators/ReachabilityChecker.cs
@@ -1,11 +1,5 @@
 using FlashPlanner.States;
-using FlashPlanner.Tools;
 using PDDLSharp.Models.SAS;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace FlashPlanner.Translators
 {
@@ -29,7 +23,7 @@ public List<Operator> GetPotentiallyReachableOperators(SASDecl decl)
             {
                 any = false;
                 var applicableNow = new List<Operator>();
-                for(int i = 0; i < decl.Operators.Count; i++)
+                for (int i = 0; i < decl.Operators.Count; i++)
                 {
                     if (!covered[i] && state.IsApplicable(decl.Operators[i]))
                     {