Merge pull request #1 from luogu-dev/master

Update the new library

Author: Sweetlemon68

.gitignore

@@ -1,4 +1,6 @@
 config.py
+*.in
+*.out
 
 # Created by .ignore support plugin (hsz.mobi)
 ### Python template

.travis.yml

@@ -0,0 +1,9 @@
+language: python
+python:
+  - "2.7"
+  - "3.5"
+  - "3.6"
+  - "pypy"
+  - "pypy3"
+script: python unit_test.py
+

LICENSE

@@ -2,7 +2,7 @@
 CYaRon: Yet Another Random Olympic-iNformatics test data generator
 
 By Luogu
-
+[![](https://travis-ci.org/luogu-dev/cyaron.svg?branch=master)](https://travis-ci.org/luogu-dev/cyaron)
 
 你是否遇到以下情况：
 - 希望在5分钟内写出一组随机数据
@@ -14,15 +14,18 @@ By Luogu
 - 建一个随机图（简单图或者非简单图，有向图或无向图，带权图或者无权图）
 - 建一个随机树（链状、随机树、或者菊花图，而且可以设定树的强弱）
 - 生成一组允许相同或者互相不同的多维向量（可以较快速度生成10^6组、范围到10^9的向量或者数列）
+- 根据函数解析式生成数列
+- 生成一些随机多边形，并且可以求面积、周长等
+- 从字典生成随机字符串、单词、句子、段落
 
 **快速上手指南**
 
 你可以下载github源代码  https://github.com/luogu-dev/cyaron ，或者`pip install cyaron`。在此之前，需要准备好python2/3。
 
-暂时文档没有写好，之后将慢慢补充。请根据demo和源代码进行YY。
+[文档](https://github.com/luogu-dev/cyaron/wiki/%E9%A6%96%E9%A1%B5)仍在建设中，尚不完整，之后将慢慢补充。请根据`examples`和源代码进行YY。
 
 首批贡献者 @fjzzq2002 @lin_toto @kkksc03 
 
 之后计划实现云Generator，即只需提供写好的python脚本以及std，上传到服务器，即可下载一个测试数据的压缩包，真正实现5分钟生成一个测试数据！
 
-目前CYaRon的功能还比较初级，希望各位大佬一起来协助改进这个项目。希望这个项目可以帮助大家节省时间！
+目前CYaRon的功能还比较初级，希望各位大佬一起来协助改进这个项目。希望这个项目可以帮助大家节省时间！

README.md

@@ -11,5 +11,6 @@
 from .utils import *
 from .consts import *
 from .vector import Vector
+from .polygon import Polygon
 from random import randint, randrange, uniform, choice, random
 

cyaron/__init__.py

@@ -51,7 +51,7 @@ def to_str(self, **kwargs):
             edge_buf = []
             for edge in self.iterate_edges():
                 edge_buf.append(
-                    Edge(tmp[edge.start], tmp[edge.end], edge.weight))
+                    Edge(new_node_id[edge.start], new_node_id[edge.end], edge.weight))
             random.shuffle(edge_buf)
             for edge in edge_buf:
                 if not self.directed and random.randint(0, 1) == 0:
@@ -74,7 +74,8 @@ def iterate_edges(self):
         """
         for node in self.edges:
             for edge in node:
-                yield edge
+                if edge.end >= edge.start or self.directed:
+                    yield edge
 
     def __add_edge(self, x, y, w):
         """__add_edge(self, x, y, w) -> None
@@ -92,7 +93,6 @@ def add_edge(self, x, y, **kwargs):
                                         not directed means if you added the edge x->y, you would also add the edge y->x
         """
         weight = kwargs.get("weight", 1)
-        directed = kwargs.get("directed", True)
         self.__add_edge(x, y, weight)
         if not self.directed and x != y:
             self.__add_edge(y, x, weight)
@@ -145,7 +145,7 @@ def tree(point_count, chain=0, flower=0, **kwargs):
         """
         directed = kwargs.get("directed", False)
         weight_limit = kwargs.get("weight_limit", (1, 1))
-        if not isinstance(weight_limit, tuple):
+        if not list_like(weight_limit):
             weight_limit = (1, weight_limit)
         weight_gen = kwargs.get(
             "weight_gen", lambda: random.randint(
@@ -193,7 +193,7 @@ def binary_tree(point_count, left=0, right=0, **kwargs):
         """
         directed = kwargs.get("directed", False)
         weight_limit = kwargs.get("weight_limit", (1, 1))
-        if not isinstance(weight_limit, tuple):
+        if not list_like(weight_limit):
             weight_limit = (1, weight_limit)
         weight_gen = kwargs.get(
             "weight_gen", lambda: random.randint(
@@ -204,11 +204,11 @@ def binary_tree(point_count, left=0, right=0, **kwargs):
         if left + right > 1:
             raise Exception("left plus right must be smaller than 1")
 
-        can_left = {1}
-        can_right = {1}
+        can_left = set([1])
+        can_right = set([1])
         graph = Graph(point_count, directed)
         for i in range(2, point_count + 1):
-            edge_pos = random.uniform(0, 1)
+            edge_pos = random.random()
             node = 0
             # Left
             if edge_pos < left or left + right < edge_pos <= (1.0 - left - right) / 2:
@@ -240,7 +240,7 @@ def graph(point_count, edge_count, **kwargs):
         """
         directed = kwargs.get("directed", False)
         weight_limit = kwargs.get("weight_limit", (1, 1))
-        if not isinstance(weight_limit, tuple):
+        if not list_like(weight_limit):
             weight_limit = (1, weight_limit)
         weight_gen = kwargs.get(
             "weight_gen", lambda: random.randint(
@@ -250,9 +250,8 @@ def graph(point_count, edge_count, **kwargs):
             u = random.randint(1, point_count)
             v = random.randint(1, point_count)
             graph.add_edge(u, v, weight=weight_gen())
-    return graph
-    
-    # hack spfa (maybe?)
+        return graph
+
     @staticmethod
     def hack_spfa(point_count, **kwargs):
         """hack_spfa(point_count, **kwargs) -> None
@@ -270,7 +269,7 @@ def hack_spfa(point_count, **kwargs):
         directed = kwargs.get("directed", False)
         extraedg = kwargs.get("extra_edge", 2)
         weight_limit = kwargs.get("weight_limit", (1, 1))
-        if not isinstance(weight_limit, tuple):
+        if not list_like(weight_limit):
             weight_limit = (1, weight_limit)
         weight_gen = kwargs.get(
             "weight_gen", lambda: random.randint(
@@ -280,7 +279,7 @@ def hack_spfa(point_count, **kwargs):
         graph = Graph(point_count, directed)
         if point_count % 2 == 1:
             point_to_skip = point_count / 2 + 1
-        half = point_count / 2
+        half = int(point_count / 2)
 
         for i in range(1, half):
             (x, y) = (i, i + 1)
@@ -298,4 +297,5 @@ def hack_spfa(point_count, **kwargs):
             u = random.randint(1, point_count)
             v = random.randint(1, point_count)
             graph.add_edge(u, v, weight=weight_gen())
+
         return graph

cyaron/graph.py

@@ -1,3 +1,4 @@
+from .utils import *
 import subprocess
 
 
@@ -31,16 +32,20 @@ def __init__(self, *args, **kwargs):
 
             input_suffix = kwargs.get("input_suffix", ".in")
             output_suffix = kwargs.get("output_suffix", ".out")
+            disable_output = kwargs.get("disable_output", False)
             self.input_filename = filename_prefix + input_suffix
-            self.output_filename = filename_prefix + output_suffix
+            self.output_filename = filename_prefix + output_suffix if not disable_output else None
+        elif len(args) == 1:
+            self.input_filename = args[0]
+            self.output_filename = None
         elif len(args) == 2:
             self.input_filename = args[0]
             self.output_filename = args[1]
         else:
             raise Exception("Invalid argument count")
 
         self.input_file = open(self.input_filename, 'w')
-        self.output_file = open(self.output_filename, 'w')
+        self.output_file = open(self.output_filename, 'w') if self.output_filename else None
 
     def __del__(self):
         """__del__(self) -> None
@@ -52,30 +57,53 @@ def __del__(self):
         except Exception:
             pass
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        """__del__(self) -> None
+            Exit the context of the IO object and close the input file and the output file
+        """
+        try:
+            self.input_file.close()
+            self.output_file.close()
+        except Exception:
+            pass
+
     @staticmethod
-    def __write(file, *args):
-        """__write(file, *args) -> None
+    def __write(file, *args, **kwargs):
+        """__write(file, *args, **kwargs) -> None
             Write every element in *args into file. If the element isn't "\n", insert a space. It will convert every element into str
             file file -> the file object to write
+            **kwargs:
+                str separator = " " -> a string used to separate every element
         """
+        separator = kwargs.get("separator", " ")
         for arg in args:
-            file.write(str(arg))
-            if arg != "\n":
-                file.write(" ")
+            if list_like(arg):
+                IO.__write(file, *arg, **kwargs)
+            else:
+                file.write(str(arg))
+                if arg != "\n":
+                    file.write(separator)
 
-    def write(self, *args):
-        """write(self, *args) -> None
+    def input_write(self, *args, **kwargs):
+        """input_write(self, *args, **kwargs) -> None
             Write every element in *args into the input file. Splits with spaces. It will convert every element into string
+            **kwargs:
+                str separator = " " -> a string used to separate every element
         """
-        IO.__write(self.input_file, *args)
+        IO.__write(self.input_file, *args, **kwargs)
 
-    def writeln(self, *args):
-        """writeln(self, *args) -> None
+    def input_writeln(self, *args, **kwargs):
+        """input_writeln(self, *args, **kwargs) -> None
             Write every element in *args into the input file and turn to a new line. Splits with spaces. It will convert every element into string
+            **kwargs:
+                str separator = " " -> a string used to separate every element
         """
         args = list(args)
         args.append("\n")
-        self.write(*args)
+        self.input_write(*args, **kwargs)
 
     def output_gen(self, shell_cmd):
         """output_gen(self, shell_cmd) -> None
@@ -84,20 +112,24 @@ def output_gen(self, shell_cmd):
         """
         self.input_file.close()
         with open(self.input_filename, 'r') as f:
-            self.output_file.write(subprocess.check_output(shell_cmd, shell=True, stdin=f))
+            self.output_file.write(subprocess.check_output(shell_cmd, shell=True, stdin=f).decode('ascii'))
 
         self.input_file = open(self.input_filename, 'a')
 
-    def output_write(self, *args):
-        """output_write(self, *args) -> None
+    def output_write(self, *args, **kwargs):
+        """output_write(self, *args, **kwargs) -> None
             Write every element in *args into the output file. Splits with spaces. It will convert every element into string
+            **kwargs:
+                str separator = " " -> a string used to separate every element
         """
-        IO.__write(self.output_file, *args)
+        IO.__write(self.output_file, *args, **kwargs)
 
-    def output_writeln(self, *args):
-        """output_writeln(self, *args) -> None
+    def output_writeln(self, *args, **kwargs):
+        """output_writeln(self, *args, **kwargs) -> None
             Write every element in *args into the output file and turn to a new line. Splits with spaces. It will convert every element into string
+            **kwargs:
+                str separator = " " -> a string used to separate every element
         """
         args = list(args)
         args.append("\n")
-        self.output_write(*args)
+        self.output_write(*args, **kwargs)