Merge branch 'future'

yoshi-seals1.3.3/Seals/scan/scan.py

@@ -20,18 +20,12 @@
 import numpy as np
 import pandas as pd
 
-def numpy(path, sep=None, decimal=None):
+def numpy(path, sep=None):
 
     if sep is None:
         sep = ","
 
-    if decimal is None:
-        decimal = "."
-
-    df=pd.read_csv(path, sep=sep, decimal=decimal, header=None)
-    array = df.to_numpy()
-
-    return array
+    return np.genfromtxt(path, delimiter=sep)
 
 def pandas(path, sep=None, decimal=None):
 

yoshi-seals1.3.3/Seals/write/__init__.py

@@ -17,5 +17,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-from .write import numpy as np
-from .write import pandas as pd
+from .write import numpy
+from .write import pandas
+
+np = numpy()
+pd = pandas()

yoshi-seals1.3.3/Seals/write/write.py

@@ -18,16 +18,34 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 import csv
+import numpy as np
+import pandas as pd
 
-def numpy(array, path):
+class numpy:
 
-    with open(path, mode='w') as sistema_linear:
+    def __init__(self):
+        pass
+    def csv(self, array, path):
 
-        solution_writer = csv.writer(sistema_linear, delimiter=',', quotechar='"', quoting=csv.QUOTE_MINIMAL)
-        solution_writer.writerows(array)
-        
-    return array
+        with open(path, mode='w') as sistema_linear:
 
-def pandas(df, path):
-    
-    df.to_csv(path)
+            solution_writer = csv.writer(sistema_linear, delimiter=',', quotechar='"', quoting=csv.QUOTE_MINIMAL)
+            solution_writer.writerows(array)
+
+    def txt(self, array, path):
+
+        np.savetxt(path, array, fmt='%8f', delimiter=' ', \
+            newline='\n', header='', footer='', comments='# ', encoding=None)
+
+class pandas:
+
+    def __init__(self):
+        pass
+    def csv(self, df, path):
+
+        df.to_csv(path)
+
+    def txt(self, df, path):
+
+        np.savetxt(path, df.values, fmt='%8f', delimiter=' ', \
+            newline='\n', header='', footer='', comments='# ', encoding=None)