Merge pull request #31 from sepandhaghighi/dev

Version 0.5

.github/CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at sepand@qpage.ir. All
+reported by contacting the project team at info@pyrgg.ir. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

CHANGELOG.md

@@ -5,6 +5,13 @@ 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.5] - 2020-07-01
+### Added
+- TSV format
+- Multigraph control
+### Changed
+- `branch_gen` function modified
+- Website changed to [https://www.pyrgg.ir](https://www.pyrgg.ir)
 ## [0.4] - 2020-06-17
 ### Added
 - Self loop control
@@ -50,7 +57,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.4...dev
+[Unreleased]: https://github.com/sepandhaghighi/pyrgg/compare/v0.5...dev
+[0.5]: https://github.com/sepandhaghighi/pyrgg/compare/v0.4...v0.5
 [0.4]: https://github.com/sepandhaghighi/pyrgg/compare/v0.3...v0.4
 [0.3]: https://github.com/sepandhaghighi/pyrgg/compare/v0.2...v0.3
 [0.2]: https://github.com/sepandhaghighi/pyrgg/compare/v0.1...v0.2

README.md

@@ -90,23 +90,23 @@ Pyrgg target audiences are computer scientists who study graph algorithms and gr
 ## Installation		
 
 ### Source Code
-- Download [Version 0.4](https://github.com/sepandhaghighi/pyrgg/archive/v0.4.zip) or [Latest Source ](https://github.com/sepandhaghighi/pyrgg/archive/dev.zip)
+- Download [Version 0.5](https://github.com/sepandhaghighi/pyrgg/archive/v0.5.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.4` or `pip3 install pyrgg==0.4` (Need root access)							
+- `pip install pyrgg==0.5` or `pip3 install pyrgg==0.5` (Need root access)							
 
 ### Conda
 
 - Check [Conda Managing Package](https://conda.io)
 - `conda install -c sepandhaghighi pyrgg` (Need root access)	
 
 ### Exe Version (Only Windows)
-- Download [Exe-Version 0.4](https://github.com/sepandhaghighi/pyrgg/releases/download/v0.4/PYRGG-0.4.exe)
-- Run `PYRGG-0.4.exe`
+- Download [Exe-Version 0.5](https://github.com/sepandhaghighi/pyrgg/releases/download/v0.5/PYRGG-0.5.exe)
+- Run `PYRGG-0.5.exe`
 
 ### System Requirements
 Pyrgg will likely run on a modern dual core PC. Typical configuration is:
@@ -129,7 +129,7 @@ Note that it may run on lower end equipment though good performance is not guara
 ## Issues & Bug Reports			
 
 Just fill an issue and describe it. I'll check it ASAP!							
-or send an email to [sepand@qpage.ir](mailto:sepand@qpage.ir "sepand@qpage.ir"). 
+or send an email to [info@pyrgg.ir](mailto:info@pyrgg.ir "info@pyrgg.ir"). 
 
 ## TODO	
 - [x] Formats
@@ -138,6 +138,7 @@ or send an email to [sepand@qpage.ir](mailto:sepand@qpage.ir "sepand@qpage.ir").
   - [x] YAML
   - [x] Pickle 
   - [x] CSV
+  - [x] TSV
   - [x] WEL	
   - [x] ASP
   - [x] TGF
@@ -169,6 +170,8 @@ or send an email to [sepand@qpage.ir](mailto:sepand@qpage.ir "sepand@qpage.ir").
 - [Sample 2-JSON](https://www.dropbox.com/s/f6kljlch7p2rfhy/1000.json?dl=0) (1000 Vertices , 105KB)
 - [Sample 1-CSV](https://www.dropbox.com/s/dmld0eadftnatr5/100.csv?dl=0) (100 Vertices , 3KB)
 - [Sample 2-CSV](https://www.dropbox.com/s/juxah4nwamzdegr/1000.csv?dl=0) (1000 Vertices , 51KB)
+- [Sample 1-TSV](https://www.dropbox.com/s/j3zgs4kx2paxe75/100.tsv?dl=0) (100 Vertices , 29KB)
+- [Sample 2-TSV](https://www.dropbox.com/s/ykagmjgwlpim6dq/1000.tsv?dl=0) (1000 Vertices , 420KB)
 - [Sample 1-WEL](https://www.dropbox.com/s/moie1xb2wj90y33/100.wel?dl=0) (100 Vertices , 5KB)
 - [Sample 2-WEL](https://www.dropbox.com/s/h6pohl60okhdnt7/1000.wel?dl=0) (1000 Vertices , 192KB)
 - [Sample 1-YAML](https://www.dropbox.com/s/9seljohtoqjzjzy/30.yaml?dl=0) (30 Vertices , 3KB)
@@ -224,6 +227,18 @@ or send an email to [sepand@qpage.ir](mailto:sepand@qpage.ir "sepand@qpage.ir").
 		
 		<head_n>,<tail_n>,<weight_n>
 	```
+
+- [TSV(.tsv)](https://en.wikipedia.org/wiki/Tab-separated_values)
+	```
+		<head_1>	<tail_1>	<weight_1>
+
+		.
+		.
+		.
+		
+		<head_n>	<tail_n>	<weight_n>
+	```
+
 - [JSON(.json)](https://en.wikipedia.org/wiki/JSON)
 
 	```

codecov.yml

@@ -0,0 +1,11 @@
+codecov:
+  require_ci_to_pass: yes
+
+coverage:
+  precision: 2
+  round: up
+  range: "70...100"
+  status:
+    patch:
+      default:
+        enabled: no

otherfile/Version.rc

@@ -1,7 +1,7 @@
 VSVersionInfo(
   ffi=FixedFileInfo(
-    filevers=(0, 4, 0, 0),
-    prodvers=(0, 4, 0, 0),
+    filevers=(0, 5, 0, 0),
+    prodvers=(0, 5, 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.4.0.0'),
+        StringStruct(u'FileVersion', u'0.5.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, 4, 0, 0')])
+        StringStruct(u'ProductVersion', u'0, 5, 0, 0')])
     ]), 
     VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
   ]

otherfile/pyrgg_profile.py

@@ -3,4 +3,4 @@
 from pyrgg import *
 
 
-dimacs_maker('profile', 1, 5000, 30000, 1, 60, 0, 1,1)
+dimacs_maker('profile', 1, 5000, 30000, 1, 60, 0, 1, 1, 1)

otherfile/version_check.py

@@ -4,7 +4,7 @@
 import sys
 import codecs
 Failed = 0
-VERSION = "0.4"
+VERSION = "0.5"
 
 VERSION_1 = VERSION.split(".")[0]
 VERSION_2 = str(int(float(VERSION) * 10 - int(VERSION_1) * 10))

pyrgg/__main__.py

@@ -16,7 +16,8 @@
     6: lp_maker,
     7: json_maker,
     8: dl_maker,
-    9: tgf_maker}
+    9: tgf_maker,
+    10: tsv_maker}
 
 
 def run():
@@ -36,6 +37,7 @@ def run():
     sign = input_dict["sign"]
     direct = input_dict["direct"]
     self_loop = input_dict["self_loop"]
+    multigraph = input_dict["multigraph"]
     print("Generating . . . ")
     edge_number = GENERATOR_MENU[input_dict["output_format"]](
         file_name,
@@ -46,7 +48,8 @@ def run():
         max_edge,
         sign,
         direct,
-        self_loop)
+        self_loop,
+        multigraph)
     if input_dict["output_format"] == 4:
         json_to_yaml(file_name)
     if input_dict["output_format"] == 7:

pyrgg/params.py

@@ -4,7 +4,8 @@
 
 MENU_ITEMS1 = {
     "file_name": "File Name : ",
-    "output_format": "Graph Format : \nDIMACS(.gr)[1] | JSON(.json)[2] | CSV(.csv)[3] | YAML(.yaml)[4]\n| WEL(.wel)[5] | ASP(.lp)[6] | Pickle(.p)[7] | UCINET DL Format(.dl)[8] | TGF(.tgf)[9]",
+    "output_format": "Graph Format : \nDIMACS(.gr)[1] | JSON(.json)[2] | CSV(.csv)[3] | YAML(.yaml)[4]\n| WEL(.wel)[5] | ASP(.lp)[6] | Pickle(.p)[7] | UCINET DL Format(.dl)[8] | TGF(.tgf)[9] | TSV("
+                     ".tsv)[10]",
     "weight": "Weighted[1] or Unweighted[2]"}
 
 MENU_ITEMS2 = {"vertices": "Vertices Number : ",
@@ -14,7 +15,8 @@
                "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]"}
+               "self_loop": "Self Loop[1] or No Self Loop[2]",
+               "multigraph": "Simple[1] or Multigraph[2]"}
 
 
 SUFFIX_MENU = {
@@ -26,15 +28,16 @@
     6: ".lp",
     7: ".p",
     8: ".dl",
-    9: ".tgf"}
+    9: ".tgf",
+    10: ".tsv"}
 
 
-PYRGG_VERSION = "0.4"
+PYRGG_VERSION = "0.5"
 
 SOURCE_DIR = os.getcwd()
 
 PYRGG_LINKS = """
-Webpage : http://pyrgg.shaghighi.ir/
+Webpage : https://www.pyrgg.ir
 Repository : https://github.com/sepandhaghighi/pyrgg
 Paper : https://doi.org/10.21105/joss.00331
 * If you use Pyrgg in your research, please cite our paper