From 803461f8a6d2bd354e97561c77c29881f21fcf32 Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Sun, 26 Jul 2020 16:34:44 +0430 Subject: [PATCH 01/13] feat : gl_maker function added #36 --- pyrgg/pyrgg.py | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/pyrgg/pyrgg.py b/pyrgg/pyrgg.py index 4c5cb7b5..11466f64 100644 --- a/pyrgg/pyrgg.py +++ b/pyrgg/pyrgg.py @@ -992,6 +992,64 @@ def tgf_maker( file.close() return edge_number +def gl_maker( + file_name, + min_weight, + max_weight, + vertices, + min_edge, + max_edge, + sign, + direct, + self_loop, + multigraph): + """ + Create output file in Graph Line(GL). + + :param file_name: file name + :type file_name: str + :param min_weight: weight min range + :type min_weight: int + :param max_weight: weight max range + :type max_weight: int + :param vertices: number of vertices + :type vertices: int + :param min_edge : minimum edge number + :type min_edge : int + :param max_edge : maximum edge number + :type max_edge : int + :param sign: weight sign flag + :type sign: int + :param direct: directed and undirected graph flag + :type direct: int + :param self_loop: self loop flag + :type self_loop: int + :param multigraph: multigraph flag + :type multigraph: int + :return: edge_number as int + """ + file = open(file_name + ".gl", "w") + dicts = edge_gen( + vertices, + min_weight, + max_weight, + min_edge, + max_edge, + sign, + direct, + self_loop, + multigraph) + edge_dic = dicts[0] + weight_dic = dicts[1] + edge_number = dicts[2] + for i in edge_dic.keys(): + line_data = str(i) + for j, value in enumerate(edge_dic[i]): + line_data += " " + str(value)+":"+str(weight_dic[i][j]) + file.write(line_data + "\n") + file.close() + return edge_number + def dl_maker( file_name, From 78d0fc0d827802a0f5277e2f2e9194a3bb1d6037 Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Sun, 26 Jul 2020 16:46:25 +0430 Subject: [PATCH 02/13] fix : tests updated #36 --- pyrgg/test.py | 17 ++++++ test/test.py | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 179 insertions(+) diff --git a/pyrgg/test.py b/pyrgg/test.py index 8aabd79f..006da5bd 100644 --- a/pyrgg/test.py +++ b/pyrgg/test.py @@ -484,6 +484,21 @@ 9 8 -97 10 9 143 +>>> random.seed(2) +>>> gl_maker('testfile', 0, 200, 10, 0, 2, 0, 1,1,1) +7 +>>> file=open('testfile.gl','r') +>>> print(file.read()) +1 +2 +3 +4 3:-64 +5 4:148 3:-163 +6 9:-139 +7 9:-9 +8 +9 8:-97 +10 9:143 >>> file=open('testfile.csv','r') >>> print(file.read()) 4,3,-64 @@ -1313,6 +1328,8 @@ >>> os.remove('testfile.tgf') >>> os.remove('testfile.wel') >>> os.remove('testfile.yaml') +>>> os.remove('testfile.mtx') +>>> os.remove('testfile.gl') >>> os.remove('testfile2.csv') >>> os.remove('testfile2.dl') >>> os.remove('testfile2.gr') diff --git a/test/test.py b/test/test.py index 476d48ef..d4764e64 100644 --- a/test/test.py +++ b/test/test.py @@ -709,6 +709,21 @@ 10,9,143 >>> random.seed(2) +>>> gl_maker('testfile', 0, 200, 10, 1, 2, 0, 1,1,1) +14 +>>> file=open('testfile.gl','r') +>>> print(file.read()) +1 2:92 +2 5:-155 +3 10:148 +4 7:-185 +5 9:-128 5:7 +6 8:-97 7:143 +7 4:6 +8 6:34 +9 9:114 7:-151 +10 6:-41 8:-167 +>>> random.seed(2) >>> mtx_maker('testfile', 0, 200, 10, 0, 2, 0, 1,1,1) 7 >>> g = mmread("testfile.mtx") @@ -734,6 +749,41 @@ 10 9 143 >>> random.seed(4) +>>> gl_maker('testfile2',0,50,30,2,4,0,1,1,1) +85 +>>> file=open('testfile2.gl','r') +>>> print(file.read()) +1 10:46 14:-9 +2 3:25 19:-48 +3 8:-17 26:6 +4 7:41 27:-17 8:19 +5 21:-5 29:-42 13:11 +6 16:-5 28:0 +7 19:-48 17:26 14:-27 +8 6:19 10:5 2:-40 +9 17:-44 11:43 7:26 +10 21:-17 6:-27 +11 19:-40 18:20 4:45 9:-48 +12 20:7 11:18 16:2 13:18 +13 22:-1 11:-20 5:-39 25:18 +14 7:-18 5:-24 22:21 21:23 +15 15:23 27:-18 +16 4:-13 15:7 2:3 27:38 +17 5:34 17:20 2:33 12:-41 +18 16:15 15:-31 +19 8:-28 9:-13 +20 7:2 10:-15 19:49 +21 14:-9 11:20 +22 4:-41 22:31 14:27 8:21 +23 22:-41 11:-33 7:-21 +24 16:17 22:2 13:49 +25 22:10 24:-36 16:-24 +26 26:13 6:39 +27 4:-49 27:-14 19:12 +28 22:-35 26:-33 +29 1:2 24:31 19:-38 +30 2:-5 26:19 +>>> random.seed(4) >>> csv_maker('testfile2',0,50,30,0,4,0,1,1,1) 41 >>> random.seed(4) @@ -830,6 +880,111 @@ 29,20,38 >>> random.seed(20) +>>> gl_maker('testfile3',10,30,100,3,4,2,1,1,1) +340 +>>> file=open('testfile3.gl','r') +>>> print(file.read()) +1 34:30 13:20 76:15 +2 53:23 10:13 18:20 +3 75:24 53:16 26:20 84:20 +4 55:12 82:26 64:22 11:16 +5 5:16 14:12 27:18 +6 40:18 21:29 16:10 37:17 +7 74:17 8:10 85:29 +8 36:14 90:30 44:29 96:24 +9 82:18 72:23 21:15 +10 91:13 89:14 75:23 45:17 +11 78:11 67:16 56:15 +12 11:13 39:10 86:20 +13 59:26 98:11 87:15 16:24 +14 2:12 75:13 13:20 35:30 +15 85:19 86:11 4:16 +16 66:26 91:10 21:10 +17 40:14 55:18 14:22 +18 28:17 26:17 13:19 +19 72:22 18:30 11:24 +20 1:15 26:30 42:22 14:19 +21 47:29 39:14 89:13 +22 36:11 51:21 97:19 +23 60:13 9:28 63:16 2:26 +24 97:27 80:20 93:10 +25 36:19 79:13 1:11 +26 96:16 80:22 90:29 +27 75:21 37:24 7:30 +28 80:22 72:22 51:18 +29 100:24 12:28 64:20 +30 100:16 38:24 45:22 +31 80:11 45:14 12:21 +32 98:13 62:17 71:14 +33 100:10 18:21 46:26 20:10 +34 56:26 59:17 51:22 +35 65:29 85:19 81:12 87:25 +36 46:14 61:17 65:14 47:20 +37 82:27 98:13 97:18 +38 68:16 48:22 28:27 +39 61:30 23:14 17:18 4:28 +40 100:15 44:18 32:20 +41 19:18 35:13 17:19 +42 64:11 66:11 61:25 +43 92:26 96:13 84:14 93:19 +44 22:24 58:26 64:14 24:16 +45 38:13 25:24 54:24 +46 99:19 82:27 15:16 +47 94:19 27:26 38:23 +48 13:21 68:17 98:15 74:28 +49 38:14 2:20 51:14 39:26 +50 66:12 23:29 67:26 +51 15:18 55:28 12:27 +52 78:24 57:23 94:11 +53 23:13 65:29 75:30 +54 21:17 37:17 16:13 74:27 +55 56:20 31:27 96:15 68:11 +56 12:26 4:19 5:18 49:18 +57 69:22 83:12 89:21 2:11 +58 21:17 83:12 96:24 +59 6:10 79:16 51:27 74:24 +60 37:24 91:26 39:20 +61 58:16 20:29 84:13 +62 46:15 86:16 24:17 +63 1:13 8:17 57:26 85:29 +64 86:18 79:20 84:29 70:14 +65 7:10 13:26 67:26 63:15 +66 27:27 46:14 19:19 +67 22:27 40:24 28:12 +68 20:10 81:14 67:21 +69 47:10 34:10 60:10 42:19 +70 59:19 7:10 5:12 3:26 +71 54:18 60:29 36:12 86:23 +72 4:22 99:10 35:10 +73 87:10 41:13 65:23 +74 43:26 4:10 90:13 +75 80:17 58:17 45:21 +76 91:26 16:12 33:18 +77 60:25 6:11 99:30 62:12 +78 21:28 68:29 29:27 +79 26:17 38:11 17:21 +80 94:20 57:25 1:19 80:13 +81 95:16 37:14 78:28 94:28 +82 8:17 34:15 69:11 +83 81:13 25:13 62:24 +84 30:11 57:17 38:20 42:17 +85 63:23 87:12 27:16 29:25 +86 84:20 20:24 87:27 53:12 +87 97:14 61:16 74:28 +88 62:18 1:13 68:24 +89 29:13 86:10 18:12 +90 50:26 4:27 45:16 +91 83:27 36:20 28:17 56:11 +92 84:27 79:10 68:17 92:24 +93 54:20 97:21 11:12 82:22 +94 23:18 17:12 91:14 6:14 +95 16:28 4:16 13:20 +96 6:25 31:14 94:22 +97 59:18 73:16 7:20 +98 10:23 58:23 55:27 17:30 +99 73:30 96:26 79:17 +100 13:27 3:16 1:26 8:20 +>>> random.seed(20) >>> csv_maker('testfile3',10,30,100,0,4,2,1,1,1) 197 >>> random.seed(20) @@ -1100,6 +1255,10 @@ >>> random.seed(20) >>> tsv_maker('testfile3',10,30,100,0,4,2,2,1,2) 198 +>>> gl_maker('testfile', 0, 200, 10, 0,0,1) +Traceback (most recent call last): + ... +TypeError: gl_maker() missing 3 required positional arguments: 'direct', 'self_loop', and 'multigraph' >>> csv_maker('testfile', 0, 200, 10, 0,0,1) Traceback (most recent call last): ... @@ -1727,6 +1886,7 @@ >>> os.remove('testfile.tsv') >>> os.remove('testfile.mtx') >>> os.remove('testfile.dl') +>>> os.remove('testfile.gl') >>> os.remove('testfile.gr') >>> os.remove('testfile.json') >>> os.remove('testfile.lp') @@ -1738,6 +1898,7 @@ >>> os.remove('testfile2.mtx') >>> os.remove('testfile2.tsv') >>> os.remove('testfile2.dl') +>>> os.remove('testfile2.gl') >>> os.remove('testfile2.gr') >>> os.remove('testfile2.json') >>> os.remove('testfile2.lp') @@ -1748,6 +1909,7 @@ >>> os.remove('testfile3.csv') >>> os.remove('testfile3.mtx') >>> os.remove('testfile3.tsv') +>>> os.remove('testfile3.gl') >>> os.remove('testfile3.gr') >>> os.remove('testfile4.gr') >>> os.remove('testfile3.json') From b81b24f7620894f4c55ea18b1c1e6239f2e5ebc5 Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Sun, 26 Jul 2020 16:49:05 +0430 Subject: [PATCH 03/13] doc : README updated #36 --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 4d3007af..d174b610 100644 --- a/README.md +++ b/README.md @@ -363,6 +363,15 @@ or send an email to [info@pyrgg.ir](mailto:info@pyrgg.ir "info@pyrgg.ir"). . ``` +- Graph Line(.gl) + ``` + : : ... : + : : ... : + . + . + . + : : ... : + ``` - [Pickle(.p)](https://docs.python.org/3.5/library/pickle.html) (Binary Format) From fb8a3701de7ed4d4c5128539a44dafe98666b522 Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Sun, 26 Jul 2020 16:52:25 +0430 Subject: [PATCH 04/13] fix : graph line format added to menu #36 --- pyrgg/__main__.py | 3 ++- pyrgg/params.py | 5 +++-- pyrgg/pyrgg.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pyrgg/__main__.py b/pyrgg/__main__.py index 80c480d3..8410955c 100644 --- a/pyrgg/__main__.py +++ b/pyrgg/__main__.py @@ -18,7 +18,8 @@ 8: dl_maker, 9: tgf_maker, 10: tsv_maker, - 11: mtx_maker} + 11: mtx_maker + 12: gl_maker} def run(): diff --git a/pyrgg/params.py b/pyrgg/params.py index 1f9d86bd..13d29611 100644 --- a/pyrgg/params.py +++ b/pyrgg/params.py @@ -5,7 +5,7 @@ MENU_ITEMS1 = { "file_name": "File Name : ", "output_format": "Graph Formats : \n1- DIMACS(.gr)\n2- JSON(.json)\n3- CSV(.csv)\n4- YAML(.yaml)\n5- WEL(.wel)\n6- ASP(.lp)\n7- Pickle(.p)\n8- UCINET DL(.dl)\n9- TGF(.tgf)\n10- TSV(" - ".tsv)\n11- Matrix Market(.mtx)\n", + ".tsv)\n11- Matrix Market(.mtx)\n12- Graph Line(.gl)\n", "weight": "Weighted[1] or Unweighted[2]"} MENU_ITEMS2 = {"vertices": "Vertices Number : ", @@ -30,7 +30,8 @@ 8: ".dl", 9: ".tgf", 10: ".tsv", - 11: ".mtx"} + 11: ".mtx", + 12: ".gl"} PYRGG_VERSION = "0.6" diff --git a/pyrgg/pyrgg.py b/pyrgg/pyrgg.py index 11466f64..3de763ff 100644 --- a/pyrgg/pyrgg.py +++ b/pyrgg/pyrgg.py @@ -208,7 +208,7 @@ def input_filter(input_dict): filtered_dict["self_loop"] = 1 if filtered_dict["multigraph"] not in [1, 2]: filtered_dict["multigraph"] = 1 - if filtered_dict["output_format"] not in list(range(1, 12)): + if filtered_dict["output_format"] not in list(range(1, 13)): filtered_dict["output_format"] = 1 return filtered_dict From 96351e420d1bf966b30b7457cee9b486f06c71de Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Sun, 26 Jul 2020 16:58:44 +0430 Subject: [PATCH 05/13] doc : files links updated #36 --- README.md | 2 ++ pyrgg/__main__.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d174b610..36fc45c2 100644 --- a/README.md +++ b/README.md @@ -186,6 +186,8 @@ or send an email to [info@pyrgg.ir](mailto:info@pyrgg.ir "info@pyrgg.ir"). - [Sample 2-UCINET DL](https://www.dropbox.com/s/kbzbsy47uvfqdsi/1000.dl?dl=0) (1000 Vertices , 729KB) - [Sample 1-MTX](https://www.dropbox.com/s/ztw3vg0roups82q/100.mtx?dl=0) (100 Vertices , 59KB) - [Sample 2-MTX](https://www.dropbox.com/s/skjjvbbzrpvryl4/1000.mtx?dl=0) (1000 Vertices , 1.8MB) +- [Sample 1-GL](https://www.dropbox.com/s/obmmb5nw1lca9z3/100.gl?dl=0) (100 Vertices , 17KB) +- [Sample 2-GL](https://www.dropbox.com/s/intufsbudnmfv8m/1000.gl?dl=0) (1000 Vertices , 2.4MB) diff --git a/pyrgg/__main__.py b/pyrgg/__main__.py index 8410955c..f3eaa8c5 100644 --- a/pyrgg/__main__.py +++ b/pyrgg/__main__.py @@ -18,7 +18,7 @@ 8: dl_maker, 9: tgf_maker, 10: tsv_maker, - 11: mtx_maker + 11: mtx_maker, 12: gl_maker} From e96032064f326d0be4fc62cd2c0805e3245c6140 Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Sun, 26 Jul 2020 16:59:34 +0430 Subject: [PATCH 06/13] doc : CHANGELOG updated #36 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c960be4..b0d130e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Added +- Graph Line format ## [0.6] - 2020-07-24 ### Added - Matrix Market format From 1f16936e2d6752b828d361d82e93ca8d3967619b Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Sun, 26 Jul 2020 17:00:05 +0430 Subject: [PATCH 07/13] fix : autopep8 #36 --- pyrgg/pyrgg.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyrgg/pyrgg.py b/pyrgg/pyrgg.py index 3de763ff..543b6fce 100644 --- a/pyrgg/pyrgg.py +++ b/pyrgg/pyrgg.py @@ -992,6 +992,7 @@ def tgf_maker( file.close() return edge_number + def gl_maker( file_name, min_weight, @@ -1045,7 +1046,7 @@ def gl_maker( for i in edge_dic.keys(): line_data = str(i) for j, value in enumerate(edge_dic[i]): - line_data += " " + str(value)+":"+str(weight_dic[i][j]) + line_data += " " + str(value) + ":" + str(weight_dic[i][j]) file.write(line_data + "\n") file.close() return edge_number From 3ab62eed02b40e275b657ac8c852c1ea86022d61 Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Sun, 26 Jul 2020 17:58:18 +0430 Subject: [PATCH 08/13] fix : minor bug in tests fixed --- pyrgg/test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pyrgg/test.py b/pyrgg/test.py index 006da5bd..a603a85a 100644 --- a/pyrgg/test.py +++ b/pyrgg/test.py @@ -499,6 +499,7 @@ 8 9 8:-97 10 9:143 + >>> file=open('testfile.csv','r') >>> print(file.read()) 4,3,-64 From 0c01386c438fda2fb54c2486fecbed3f11f59dbc Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Mon, 3 Aug 2020 02:16:40 +0430 Subject: [PATCH 09/13] fix : minor edit in menu --- pyrgg/params.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pyrgg/params.py b/pyrgg/params.py index 13d29611..33233062 100644 --- a/pyrgg/params.py +++ b/pyrgg/params.py @@ -3,20 +3,20 @@ import os MENU_ITEMS1 = { - "file_name": "File Name : ", - "output_format": "Graph Formats : \n1- DIMACS(.gr)\n2- JSON(.json)\n3- CSV(.csv)\n4- YAML(.yaml)\n5- WEL(.wel)\n6- ASP(.lp)\n7- Pickle(.p)\n8- UCINET DL(.dl)\n9- TGF(.tgf)\n10- TSV(" + "file_name": "- File Name : ", + "output_format": "- Graph Formats : \n1- DIMACS(.gr)\n2- JSON(.json)\n3- CSV(.csv)\n4- YAML(.yaml)\n5- WEL(.wel)\n6- ASP(.lp)\n7- Pickle(.p)\n8- UCINET DL(.dl)\n9- TGF(.tgf)\n10- TSV(" ".tsv)\n11- Matrix Market(.mtx)\n12- Graph Line(.gl)\n", - "weight": "Weighted[1] or Unweighted[2]"} + "weight": "- Weighted[1] or Unweighted[2]"} -MENU_ITEMS2 = {"vertices": "Vertices Number : ", - "max_weight": "Max Weight : ", - "min_weight": "Min Weight : ", - "min_edge": "Min Edge Number :", - "max_edge": "Max Edge Number :", - "sign": "Signed[1] or Unsigned[2]", - "direct": "Directed[1] or Undirected[2]", - "self_loop": "Self Loop[1] or No Self Loop[2]", - "multigraph": "Simple[1] or Multigraph[2]"} +MENU_ITEMS2 = {"vertices": "- Vertices Number : ", + "max_weight": "- Max Weight : ", + "min_weight": "- Min Weight : ", + "min_edge": "- Min Edge Number :", + "max_edge": "- Max Edge Number :", + "sign": "- Signed[1] or Unsigned[2]", + "direct": "- Directed[1] or Undirected[2]", + "self_loop": "- Self Loop[1] or No Self Loop[2]", + "multigraph": "- Simple[1] or Multigraph[2]"} SUFFIX_MENU = { From 0de41be6f4dbf7c209b94c697fc091890c5b522a Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Mon, 3 Aug 2020 02:17:41 +0430 Subject: [PATCH 10/13] doc : CHANGELOG updated --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0d130e7..2cd942c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] ### Added - Graph Line format +### Changed +- Menu optimized ## [0.6] - 2020-07-24 ### Added - Matrix Market format From 3b58de516ed0980b3173d304ea5a644fa5e8c590 Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Tue, 4 Aug 2020 19:40:43 +0430 Subject: [PATCH 11/13] fix : menu tests updated --- pyrgg/test.py | 8 ++++---- test/test.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pyrgg/test.py b/pyrgg/test.py index a603a85a..83a01f03 100644 --- a/pyrgg/test.py +++ b/pyrgg/test.py @@ -1135,9 +1135,9 @@ >>> input_dic['sign'] 2 >>> input_dic['vertices'] -18 +20 >>> input_dic['min_edge'] -17 +19 >>> input_dic['min_weight'] 1 >>> input_dic['output_format'] @@ -1145,9 +1145,9 @@ >>> input_dic['max_weight'] 1 >>> input_dic['file_name'] -'12' +'14' >>> input_dic['max_edge'] -17 +19 >>> random.seed(2) >>> tgf_maker('testfile', 0, 200, 10, 0, 2, 0, 1, 1,1) 7 diff --git a/test/test.py b/test/test.py index d4764e64..9e884816 100644 --- a/test/test.py +++ b/test/test.py @@ -1645,9 +1645,9 @@ >>> input_dic['sign'] 2 >>> input_dic['vertices'] -18 +20 >>> input_dic['min_edge'] -17 +19 >>> input_dic['min_weight'] 1 >>> input_dic['output_format'] @@ -1655,9 +1655,9 @@ >>> input_dic['max_weight'] 1 >>> input_dic['file_name'] -'12' +'14' >>> input_dic['max_edge'] -17 +19 >>> random.seed(2) >>> tgf_maker('testfile', 0, 200, 10, 0, 2, 0, 1,1,1) 7 From 60a132c1b498ede970b3263023bc48b381be38f8 Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Wed, 5 Aug 2020 15:05:41 +0430 Subject: [PATCH 12/13] rel : migrate to version 0.7 --- CHANGELOG.md | 4 +++- README.md | 8 ++++---- otherfile/Version.rc | 8 ++++---- otherfile/version_check.py | 2 +- pyrgg/params.py | 2 +- setup.py | 4 ++-- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cd942c4..84e2fef2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [0.7] - 2020-08-07 ### Added - Graph Line format ### Changed @@ -69,7 +70,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - JSON format - README -[Unreleased]: https://github.com/sepandhaghighi/pyrgg/compare/v0.6...dev +[Unreleased]: https://github.com/sepandhaghighi/pyrgg/compare/v0.7...dev +[0.7]: https://github.com/sepandhaghighi/pyrgg/compare/v0.6...v0.7 [0.6]: https://github.com/sepandhaghighi/pyrgg/compare/v0.5...v0.6 [0.5]: https://github.com/sepandhaghighi/pyrgg/compare/v0.4...v0.5 [0.4]: https://github.com/sepandhaghighi/pyrgg/compare/v0.3...v0.4 diff --git a/README.md b/README.md index 36fc45c2..a062abfe 100644 --- a/README.md +++ b/README.md @@ -90,14 +90,14 @@ Pyrgg target audiences are computer scientists who study graph algorithms and gr ## Installation ### Source Code -- Download [Version 0.6](https://github.com/sepandhaghighi/pyrgg/archive/v0.6.zip) or [Latest Source ](https://github.com/sepandhaghighi/pyrgg/archive/dev.zip) +- Download [Version 0.7](https://github.com/sepandhaghighi/pyrgg/archive/v0.7.zip) or [Latest Source ](https://github.com/sepandhaghighi/pyrgg/archive/dev.zip) - `pip install -r requirements.txt` or `pip3 install -r requirements.txt` (Need root access) - `python3 setup.py install` or `python setup.py install` (Need root access) ### PyPI - Check [Python Packaging User Guide](https://packaging.python.org/installing/) -- `pip install pyrgg==0.6` or `pip3 install pyrgg==0.6` (Need root access) +- `pip install pyrgg==0.7` or `pip3 install pyrgg==0.7` (Need root access) ### Conda @@ -105,8 +105,8 @@ Pyrgg target audiences are computer scientists who study graph algorithms and gr - `conda install -c sepandhaghighi pyrgg` (Need root access) ### Exe Version (Only Windows) -- Download [Exe-Version 0.6](https://github.com/sepandhaghighi/pyrgg/releases/download/v0.6/PYRGG-0.6.exe) -- Run `PYRGG-0.6.exe` +- Download [Exe-Version 0.7](https://github.com/sepandhaghighi/pyrgg/releases/download/v0.7/PYRGG-0.7.exe) +- Run `PYRGG-0.7.exe` ### System Requirements Pyrgg will likely run on a modern dual core PC. Typical configuration is: diff --git a/otherfile/Version.rc b/otherfile/Version.rc index 027a83c2..8f6d11c7 100644 --- a/otherfile/Version.rc +++ b/otherfile/Version.rc @@ -1,7 +1,7 @@ VSVersionInfo( ffi=FixedFileInfo( - filevers=(0, 6, 0, 0), - prodvers=(0, 6, 0, 0), + filevers=(0, 7, 0, 0), + prodvers=(0, 7, 0, 0), mask=0x3f, flags=0x0, OS=0x40004, @@ -16,12 +16,12 @@ VSVersionInfo( u'040904B0', [StringStruct(u'CompanyName', u'Sepand Haghighi'), StringStruct(u'FileDescription', u'PYRGG.exe'), - StringStruct(u'FileVersion', u'0.6.0.0'), + StringStruct(u'FileVersion', u'0.7.0.0'), StringStruct(u'InternalName', u'PYRGG.exe'), StringStruct(u'LegalCopyright', u'Copyright (c) 2020 Sepand Haghighi'), StringStruct(u'OriginalFilename', u'PYRGG.exe'), StringStruct(u'ProductName', u'PYRGG'), - StringStruct(u'ProductVersion', u'0, 6, 0, 0')]) + StringStruct(u'ProductVersion', u'0, 7, 0, 0')]) ]), VarFileInfo([VarStruct(u'Translation', [1033, 1200])]) ] diff --git a/otherfile/version_check.py b/otherfile/version_check.py index b6077ad5..e8c5851d 100644 --- a/otherfile/version_check.py +++ b/otherfile/version_check.py @@ -4,7 +4,7 @@ import sys import codecs Failed = 0 -VERSION = "0.6" +VERSION = "0.7" VERSION_1 = VERSION.split(".")[0] VERSION_2 = str(int(float(VERSION) * 10 - int(VERSION_1) * 10)) diff --git a/pyrgg/params.py b/pyrgg/params.py index 33233062..69a93fc3 100644 --- a/pyrgg/params.py +++ b/pyrgg/params.py @@ -34,7 +34,7 @@ 12: ".gl"} -PYRGG_VERSION = "0.6" +PYRGG_VERSION = "0.7" SOURCE_DIR = os.getcwd() diff --git a/setup.py b/setup.py index abe533e3..1174133e 100644 --- a/setup.py +++ b/setup.py @@ -33,14 +33,14 @@ def read_description(): setup( name='pyrgg', packages=['pyrgg'], - version='0.6', + version='0.7', description='Python Random Graph Generator', long_description=read_description(), long_description_content_type='text/markdown', author='Sepand Haghighi', author_email='info@pyrgg.ir', url='https://github.com/sepandhaghighi/pyrgg', - download_url='https://github.com/sepandhaghighi/pyrgg/tarball/v0.6', + download_url='https://github.com/sepandhaghighi/pyrgg/tarball/v0.7', keywords='random graph python3 python generator graph-process generator DIMACS JSON YAML Pickle CSV TSV WEL ASP TGF UCINET', project_urls={ 'Webpage': 'https://www.pyrgg.ir', From dee980ba42c8ce714b9864e740f0f56a1447cb0e Mon Sep 17 00:00:00 2001 From: sepandhaghighi Date: Fri, 7 Aug 2020 15:23:00 +0430 Subject: [PATCH 13/13] fix : minor edit in input_filter function --- pyrgg/pyrgg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyrgg/pyrgg.py b/pyrgg/pyrgg.py index 543b6fce..eb5396ec 100644 --- a/pyrgg/pyrgg.py +++ b/pyrgg/pyrgg.py @@ -208,7 +208,7 @@ def input_filter(input_dict): filtered_dict["self_loop"] = 1 if filtered_dict["multigraph"] not in [1, 2]: filtered_dict["multigraph"] = 1 - if filtered_dict["output_format"] not in list(range(1, 13)): + if filtered_dict["output_format"] not in list(range(1, len(SUFFIX_MENU) + 1)): filtered_dict["output_format"] = 1 return filtered_dict