From aa6916c3ffc367f07cba0ad7c3c07faaf0689034 Mon Sep 17 00:00:00 2001 From: Thamirawaran Sathiyalogeswaran <107134124+Thamirawaran@users.noreply.github.com> Date: Sat, 12 Oct 2024 15:26:26 +0530 Subject: [PATCH 1/4] Update mkdocs.yml --- jac/support/jac-lang.org/mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jac/support/jac-lang.org/mkdocs.yml b/jac/support/jac-lang.org/mkdocs.yml index 6f013c540..dbfaad5af 100644 --- a/jac/support/jac-lang.org/mkdocs.yml +++ b/jac/support/jac-lang.org/mkdocs.yml @@ -40,7 +40,7 @@ nav: - Why: "why.md" # - ~/roadmap$: 'roadmap.md' - - Github: https://github.com/Jaseci-Labs/jaclang + - Github: https://github.com/Jaseci-Labs/jaseci - EECS449: - "learn/tutorial/readme.md" From 3282e2ce69beb66a2702db4bad188389fba29bdc Mon Sep 17 00:00:00 2001 From: Thamirawaran Sathiyalogeswaran <107134124+Thamirawaran@users.noreply.github.com> Date: Sat, 12 Oct 2024 15:28:43 +0530 Subject: [PATCH 2/4] builtin_dotgen test file updated for omitting generic edge --- jac/jaclang/tests/fixtures/builtin_dotgen.jac | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jac/jaclang/tests/fixtures/builtin_dotgen.jac b/jac/jaclang/tests/fixtures/builtin_dotgen.jac index 0b02dd61b..bdb570201 100644 --- a/jac/jaclang/tests/fixtures/builtin_dotgen.jac +++ b/jac/jaclang/tests/fixtures/builtin_dotgen.jac @@ -27,11 +27,11 @@ with entry{ d3=dotgen(b[2],edge_limit=5,depth=5);l3=d3|>len; #generate dot for all connected with b[1] node d4=dotgen(b[1],bfs=True,edge_type= ["Edge1"],node_limit=100,edge_limit=900,depth=300);l4=d4|>len; #generate dot from nodes with depth 3 connected with b[1] node d5=dotgen(b[1],node_limit=10,edge_limit=90);l5:=d5|>len; #generate dot from nodes with depth 3 connected with b[1] node - print(d1.count('a(val')==12,d1.count('#FFFFE0')==3,'Root' in d1,d1.count('GenericEdge')==30); - print(d2.count('a(val')==19,d2.count('#F5E5FF')==2 ,'Edge1' not in d2,d2.count('GenericEdge')==42); - print(d3.count('a(val')==6,d3.count("GenericEdge")==5,d3.count('#F5E5FF')==1); - print(d4.count("a(val")==25,d4.count("GenericEdge")==66,d4.count('#FFF0F')==3); - print(d5.count("Edge1(val=6)")==2, d5.count("GenericEdge()")==24); + print(d1.count('a(val')==12,d1.count('#FFFFE0')==3,'Root' in d1,d1.count('label=" "')==30); + print(d2.count('a(val')==19,d2.count('#F5E5FF')==2 ,'Edge1' not in d2,d2.count('label=" "')==42); + print(d3.count('a(val')==6,d3.count('label=" "')==5,d3.count('#F5E5FF')==1); + print(d4.count("a(val")==25,d4.count('label=" "')==66,d4.count('#FFF0F')==3); + print(d5.count("Edge1(val=6)")==2, d5.count('label=" "')==24); # print(l3 Date: Sat, 12 Oct 2024 16:00:40 +0530 Subject: [PATCH 3/4] Omitting Generic edge label updated in default.py file --- jac/jaclang/plugin/default.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jac/jaclang/plugin/default.py b/jac/jaclang/plugin/default.py index 9fc1da55e..bf06bd165 100644 --- a/jac/jaclang/plugin/default.py +++ b/jac/jaclang/plugin/default.py @@ -510,9 +510,10 @@ def dfs(node: NodeArchitype, cur_depth: int) -> None: 'fillcolor="invis", fontcolor="black"];\n' ) for source, target, edge in connections: + edge_label = html.escape(str(edge.__jac__.architype)) dot_content += ( f"{visited_nodes.index(source)} -> {visited_nodes.index(target)} " - f' [label="{html.escape(str(edge.__jac__.architype))} "];\n' + f' [label="{edge_label if "GenericEdge" not in edge_label else ""}"];\n' ) for node_ in visited_nodes: color = ( From ff1a25bda417a584684616b6dccd931255ee16a3 Mon Sep 17 00:00:00 2001 From: Thamirawaran Sathiyalogeswaran <107134124+Thamirawaran@users.noreply.github.com> Date: Sat, 12 Oct 2024 16:11:25 +0530 Subject: [PATCH 4/4] Corresponding test case modified builtin_dotgen.jac --- jac/jaclang/tests/fixtures/builtin_dotgen.jac | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jac/jaclang/tests/fixtures/builtin_dotgen.jac b/jac/jaclang/tests/fixtures/builtin_dotgen.jac index bdb570201..f1b318850 100644 --- a/jac/jaclang/tests/fixtures/builtin_dotgen.jac +++ b/jac/jaclang/tests/fixtures/builtin_dotgen.jac @@ -27,11 +27,11 @@ with entry{ d3=dotgen(b[2],edge_limit=5,depth=5);l3=d3|>len; #generate dot for all connected with b[1] node d4=dotgen(b[1],bfs=True,edge_type= ["Edge1"],node_limit=100,edge_limit=900,depth=300);l4=d4|>len; #generate dot from nodes with depth 3 connected with b[1] node d5=dotgen(b[1],node_limit=10,edge_limit=90);l5:=d5|>len; #generate dot from nodes with depth 3 connected with b[1] node - print(d1.count('a(val')==12,d1.count('#FFFFE0')==3,'Root' in d1,d1.count('label=" "')==30); - print(d2.count('a(val')==19,d2.count('#F5E5FF')==2 ,'Edge1' not in d2,d2.count('label=" "')==42); - print(d3.count('a(val')==6,d3.count('label=" "')==5,d3.count('#F5E5FF')==1); - print(d4.count("a(val")==25,d4.count('label=" "')==66,d4.count('#FFF0F')==3); - print(d5.count("Edge1(val=6)")==2, d5.count('label=" "')==24); + print(d1.count('a(val')==12,d1.count('#FFFFE0')==3,'Root' in d1,d1.count('label=""')==30); + print(d2.count('a(val')==19,d2.count('#F5E5FF')==2 ,'Edge1' not in d2,d2.count('label=""')==42); + print(d3.count('a(val')==6,d3.count('label=""')==5,d3.count('#F5E5FF')==1); + print(d4.count("a(val")==25,d4.count('label=""')==66,d4.count('#FFF0F')==3); + print(d5.count("Edge1(val=6)")==2, d5.count('label=""')==24); # print(l3