diff --git a/bisimilarity/src/bisimilarity_paige_tarkan.rs b/bisimilarity/src/bisimilarity_paige_tarjan.rs similarity index 100% rename from bisimilarity/src/bisimilarity_paige_tarkan.rs rename to bisimilarity/src/bisimilarity_paige_tarjan.rs diff --git a/bisimilarity/src/lib.rs b/bisimilarity/src/lib.rs index 64b7559..5f94ec0 100644 --- a/bisimilarity/src/lib.rs +++ b/bisimilarity/src/lib.rs @@ -1,5 +1,5 @@ pub mod bisimilarity_kanellakis_smolka; -pub mod bisimilarity_paige_tarkan; +pub mod bisimilarity_paige_tarjan; #[cfg(test)] mod test_kenallakis_smolka; diff --git a/bisimilarity/src/test_paige_tarjan.rs b/bisimilarity/src/test_paige_tarjan.rs index 3de4da9..74cda0e 100644 --- a/bisimilarity/src/test_paige_tarjan.rs +++ b/bisimilarity/src/test_paige_tarjan.rs @@ -1,4 +1,4 @@ -use super::bisimilarity_paige_tarkan::{ +use super::bisimilarity_paige_tarjan::{ bisimilarity, bisimilarity_ignore_labels, }; diff --git a/execution/src/presets.rs b/execution/src/presets.rs index e894151..094a2ea 100644 --- a/execution/src/presets.rs +++ b/execution/src/presets.rs @@ -702,7 +702,7 @@ where "{}", // bisimilarity::bisimilarity_kanellakis_smolka::bisimilarity(&&a, &&b) // bisimilarity::bisimilarity_paige_tarjan::bisimilarity_ignore_labels(&&a, &&b) - bisimilarity::bisimilarity_paige_tarkan::bisimilarity(&&a, &&b) + bisimilarity::bisimilarity_paige_tarjan::bisimilarity(&&a, &&b) )) } diff --git a/grammar_separated/src/instructions.lalrpop b/grammar_separated/src/instructions.lalrpop index 1120da6..ff831ba 100644 --- a/grammar_separated/src/instructions.lalrpop +++ b/grammar_separated/src/instructions.lalrpop @@ -456,26 +456,3 @@ pub ColorEdge: graph::EdgeColor = { } // ----------------------------------------------------------------------------- - -// pub GraphSaveOptions: presets::GraphSaveOptions = { -// "Dot" -// "|"? -// "|" -// "|" -// "|" -// ">" => -// presets::GraphSaveOptions::Dot { node_display: s_node, -// edge_display: s_edge, -// node_color: c_node, -// edge_color: c_edge, -// so }, -// "GraphML" -// "|"? -// "|" -// ">" => -// presets::GraphSaveOptions::GraphML { node_display: s_node, -// edge_display: s_edge, -// so }, -// "Serialize" "(" ")" => -// presets::GraphSaveOptions::Serialize { path }, -// } diff --git a/testing/counting.system b/testing/counting.system new file mode 100644 index 0000000..7e01617 --- /dev/null +++ b/testing/counting.system @@ -0,0 +1,33 @@ +Environment: [] +Initial Entities: {p1,p3} +Context: [{}.{inc}.{inc}.{dec}.{dec,inc}.nill] +Reactions: ( +[{p0}, {dec, inc}, {p0}]; +[{p1}, {dec, inc}, {p1}]; +[{p2}, {dec, inc}, {p2}]; +[{p3}, {dec, inc}, {p3}]; + +[{inc}, {dec, p0}, {p0}]; +[{inc, p0}, {dec, p1}, {p1}]; +[{inc, p0, p1}, {dec, p2}, {p2}]; +[{inc, p0, p1, p2}, {dec, p3}, {p3}]; + +[{inc, p1},{dec, p0},{p1}]; +[{inc, p2},{dec, p0},{p2}]; +[{inc, p3},{dec, p0},{p3}]; +[{inc, p2},{dec, p1},{p2}]; +[{inc, p3},{dec, p1},{p3}]; +[{inc, p3},{dec, p2},{p3}]; + +[{dec},{inc, p0},{p0}]; +[{dec},{inc, p0, p1},{p1}]; +[{dec},{inc, p0, p1, p2},{p2}]; +[{dec},{inc, p0, p1, p2, p3},{p3}]; + +[{dec, p0, p1},{inc},{p1}]; +[{dec, p0, p2},{inc},{p2}]; +[{dec, p0, p3},{inc},{p3}]; +[{dec, p1, p2},{inc},{p2}]; +[{dec, p1, p3},{inc},{p3}]; +[{dec, p2, p3},{inc},{p3}]; +)