From 727c718dd09c78fec1bf593b3080887333fa83c5 Mon Sep 17 00:00:00 2001 From: Thomas Walker Lynch Date: Fri, 17 Jan 2025 05:01:09 +0000 Subject: [PATCH] adds lookup on interface -> lookup_node lookup_edge --- developer/deprecated/DirectedGraph.java | 12 ++++++------ developer/deprecated/hold/Ariadne_DirectedGraph.java | 2 +- developer/deprecated/temp.java | 8 ++++---- .../example/GraphCycleCFinder/TM_SR_ND_Depth.java | 8 ++++---- developer/example/GraphIndexTree/Graph.java | 2 +- .../GraphIndexTree/four_down_four_across_CLI.java | 2 +- "developer/javac\360\237\226\211/Ariadne_Graph.java" | 7 ++++++- "document\360\237\226\211/todo.txt" | 3 +++ tester/deprecated/Test_GraphDirectedAcyclic.java | 2 +- tester/deprecated/Test_Graph_0.java | 6 +++--- 10 files changed, 30 insertions(+), 22 deletions(-) diff --git a/developer/deprecated/DirectedGraph.java b/developer/deprecated/DirectedGraph.java index c8b2420..077c588 100644 --- a/developer/deprecated/DirectedGraph.java +++ b/developer/deprecated/DirectedGraph.java @@ -100,7 +100,7 @@ public class Ariadne_GraphDirectedAcyclic extends Ariadne_Graph{ Ariadne_LabelList undefined_node_list = new Ariadne_LabelList(); for (int i = cycle_i0; i <= cycle_n; i++){ Ariadne_Label node_label = left_path.get(i); - Ariadne_Node node = super.lookup(node_label); + Ariadne_Node node = super.lookup_node(node_label); if(node != null){ node.mark(new Ariadne_Token("cycle_member")); } else{ @@ -139,7 +139,7 @@ public class Ariadne_GraphDirectedAcyclic extends Ariadne_Graph{ } Ariadne_Label it_node_label = path_stack.get(path_stack.size() - 1).get(0); - Ariadne_Node it_node = super.lookup(it_node_label); + Ariadne_Node it_node = super.lookup_node(it_node_label); if(it_node == null){ ret_value.add(new Ariadne_Token("undefined_node")); return ret_value; @@ -216,8 +216,8 @@ public class Ariadne_GraphDirectedAcyclic extends Ariadne_Graph{ } @Override - public Ariadne_Node lookup(Ariadne_Label node_label, boolean verbose){ - Ariadne_Node node = super.lookup(node_label, verbose); + public Ariadne_Node lookup_node(Ariadne_Label node_label, boolean verbose){ + Ariadne_Node node = super.lookup_node(node_label, verbose); if(node != null && node.has_mark(new Ariadne_Token("cycle_member"))){ if(verbose){ System.out.println("GraphDirectedAcyclic.lookup:: Node is part of a cycle, not returned: " + node_label); @@ -227,8 +227,8 @@ public class Ariadne_GraphDirectedAcyclic extends Ariadne_Graph{ return node; } - public Ariadne_Node lookup(Ariadne_Label node_label){ - return lookup(node_label, this.debug); + public Ariadne_Node lookup_node(Ariadne_Label node_label){ + return lookup_node(node_label, this.debug); } } diff --git a/developer/deprecated/hold/Ariadne_DirectedGraph.java b/developer/deprecated/hold/Ariadne_DirectedGraph.java index 941d935..e708f39 100644 --- a/developer/deprecated/hold/Ariadne_DirectedGraph.java +++ b/developer/deprecated/hold/Ariadne_DirectedGraph.java @@ -20,7 +20,7 @@ public class Ariadne_Graph{ public Ariadne_StepRightMachine start(); public Ariadne_StepRightMachine traverse(); - public Ariadne_Node lookup(String label); + public Ariadne_Node lookup_node(String label); } diff --git a/developer/deprecated/temp.java b/developer/deprecated/temp.java index 635708a..6bb5d87 100644 --- a/developer/deprecated/temp.java +++ b/developer/deprecated/temp.java @@ -48,7 +48,7 @@ public class IndexTree_TM_SR_ND_Diagonal extends Ariadne_TM_SR_ND_Label { IndexTree_Label root_label = IndexTree_Label.root(); read_list.add( root_label ); - IndexTree_Node root_node = lookup( root_label ); + IndexTree_Node root_node = lookup_node( root_label ); breadth_srm.mount( root_node.neighbor() ); if( breadth_srm.can_read() ){ @@ -56,7 +56,7 @@ public class IndexTree_TM_SR_ND_Diagonal extends Ariadne_TM_SR_ND_Label { } } - private IndexTree_Node lookup( Ariadne_Label label ){ + private IndexTree_Node lookup_node( Ariadne_Label label ){ return IndexTree_Node.make( (IndexTree_Label)label ); } @@ -74,7 +74,7 @@ public class IndexTree_TM_SR_ND_Diagonal extends Ariadne_TM_SR_ND_Label { Ariadne_Label label = list_of__unopened_node.remove( 0 ); // Retrieve the node using lookup - IndexTree_Node node = lookup( label ); + IndexTree_Node node = lookup_node( label ); // Mount a new breadth-first TM_SR_ND for children breadth_srm.mount( node.neighbor() ); @@ -97,7 +97,7 @@ public class IndexTree_TM_SR_ND_Diagonal extends Ariadne_TM_SR_ND_Label { Ariadne_Label label = child_list.remove( 0 ); read_list.add( label ); - IndexTree_Node node = lookup( label ); + IndexTree_Node node = lookup_node( label ); breadth_srm.mount( node.neighbor() ); if( breadth_srm.can_read() ){ diff --git a/developer/example/GraphCycleCFinder/TM_SR_ND_Depth.java b/developer/example/GraphCycleCFinder/TM_SR_ND_Depth.java index ea3abcd..4c4dbf7 100644 --- a/developer/example/GraphCycleCFinder/TM_SR_ND_Depth.java +++ b/developer/example/GraphCycleCFinder/TM_SR_ND_Depth.java @@ -50,7 +50,7 @@ import com.ReasoningTechnology.Ariadne.Ariadne_Label; import com.ReasoningTechnology.Ariadne.Ariadne_TM_SR_ND_Array; import com.ReasoningTechnology.Ariadne.Ariadne_TM_SR_ND_List; -class TM_SR_ND_Depth extends Ariadne_TM_SR_ND{ +class TM_SR_ND_Depth extends Ariadne_TM_SR_ND