Oops, another GraphPlan (search node equality) fix. Another (positive…

…) test case passes now.
sdcondon · Dec 17, 2022 · 6873d9b · 6873d9b
1 parent e9963bd
commit 6873d9b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/SCClassicalPlanning.Tests/Planning/GraphPlan/GraphPlanTests.cs b/src/SCClassicalPlanning.Tests/Planning/GraphPlan/GraphPlanTests.cs
@@ -13,7 +13,7 @@ public static class GraphPlanTests
             .AndEachOf(() => new Problem[]
             {
                 SpareTire.ExampleProblem,
-                //AirCargo.ExampleProblem,
+                AirCargo.ExampleProblem,
                 BlocksWorld.ExampleProblem,
                 //BlocksWorld.LargeExampleProblem,
             })

diff --git a/src/SCClassicalPlanning/Planning/GraphPlan/GraphPlan.cs b/src/SCClassicalPlanning/Planning/GraphPlan/GraphPlan.cs
@@ -178,7 +178,7 @@ public SearchNode(PlanningGraph.Level graphLevel, Goal goal)
             public override bool Equals(object? obj) => obj is SearchNode node && Equals(node);
 
             // NB: this struct is private - so we don't need to look at the planning graph, since it'll always match
-            public bool Equals(SearchNode node) => Equals(Goal, node.Goal);
+            public bool Equals(SearchNode node) => graphLevel.Index == node.graphLevel.Index && Equals(Goal, node.Goal);
 
             public override int GetHashCode() => HashCode.Combine(Goal);
 

diff --git a/src/SCClassicalPlanning/Planning/GraphPlan/PlanningGraph.cs b/src/SCClassicalPlanning/Planning/GraphPlan/PlanningGraph.cs
@@ -429,8 +429,7 @@ public bool ContainsNonMutex(IEnumerable<Literal> propositions)
         /// Representation of a proposition node in a planning graph.
         /// <para/>
         /// NB: We don't make use of the SCGraphTheory abstraction for the planning graph because none of the algorithms that use 
-        /// it query it via graph theoretical algorithms - so it would be needless complexity. Easy enough to change
-        /// should we ever want to do that (probably just by layering some structs over the top of these existing classes).
+        /// it query it via graph theoretical algorithms - so it would be needless complexity.
         /// </summary>
         [DebuggerDisplay("{Proposition}")]
         public class PropositionNode
@@ -453,8 +452,7 @@ public class PropositionNode
         /// Representation of an action node in a planning graph.
         /// <para/>
         /// NB: We don't make use of SCGraphTheory abstraction for the planning graph because none of the algorithms that use 
-        /// it query it via graph theoretical algorithms - so it would be needless complexity. Easy enough to change
-        /// should we ever want to do that (probably just by layering some structs over the top of these existing classes).
+        /// it query it via graph theoretical algorithms - so it would be needless complexity.
         /// </summary>
         [DebuggerDisplay("{Action.Identifier}: {Action.Effect}")]
         public class ActionNode