diff --git a/yoshi-seals1.3/README.md b/yoshi-seals1.3/README.md index 1955730..400dd62 100644 --- a/yoshi-seals1.3/README.md +++ b/yoshi-seals1.3/README.md @@ -22,7 +22,7 @@ This python package is made for applied Numeric Calculus of Linear Algebra. It i The module *scan* has a function for *Numpy* arrays and *Pandas* dataframes, and used the following syntax `Seals.scan.np(path)` for *Numpy* and `Seals.scan.pd(path)` for *Pandas*, where `path` is the path to your directory. -The module *write* has a function for *Numpy* arrays and *Pandas* dataframes, and uses the following syntax `Sealswrite.np(array,path)` for *Numpy*, where `array` is the matrix that you desire to output and `path` is the path to your directory, and `Seals.write.pd(df,path)` for *Pandas*, where `df` is the matrix that you desire to output and `path` is the path to your directory. +The module *write* has a function for *Numpy* arrays and *Pandas* dataframes, and uses the following syntax `Seals.write.np(array,path)` for *Numpy*, where `array` is the matrix that you desire to output and `path` is the path to your directory, and `Seals.write.pd(df,path)` for *Pandas*, where `df` is the matrix that you desire to output and `path` is the path to your directory. The module *insert* has a function for *matrix* and another for *vector*, and it has the following syntax `Seals.insert.function(array)`, where `insert` is the *Python Module* and `function` is either a `matrix` or a `vector` and `array` is either a *matrix* or a *vector*. diff --git a/yoshi-seals1.3/Seals/__init__.py b/yoshi-seals1.3/Seals/__init__.py index acc6016..e5d934d 100644 --- a/yoshi-seals1.3/Seals/__init__.py +++ b/yoshi-seals1.3/Seals/__init__.py @@ -15,10 +15,4 @@ # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -from .insert import insert -from .process import process -from .scan import scan -from .write import write -from .eigen import eigen \ No newline at end of file +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. \ No newline at end of file diff --git a/yoshi-seals1.3/Seals/__pycache__/__init__.cpython-37.pyc b/yoshi-seals1.3/Seals/__pycache__/__init__.cpython-37.pyc index 057739e..699f180 100644 Binary files a/yoshi-seals1.3/Seals/__pycache__/__init__.cpython-37.pyc and b/yoshi-seals1.3/Seals/__pycache__/__init__.cpython-37.pyc differ diff --git a/yoshi-seals1.3/Seals/eigen/__pycache__/__init__.cpython-37.pyc b/yoshi-seals1.3/Seals/eigen/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 0000000..4359996 Binary files /dev/null and b/yoshi-seals1.3/Seals/eigen/__pycache__/__init__.cpython-37.pyc differ diff --git a/yoshi-seals1.3/Seals/eigen/__pycache__/eigen.cpython-37.pyc b/yoshi-seals1.3/Seals/eigen/__pycache__/eigen.cpython-37.pyc new file mode 100644 index 0000000..ebbe9a2 Binary files /dev/null and b/yoshi-seals1.3/Seals/eigen/__pycache__/eigen.cpython-37.pyc differ diff --git a/yoshi-seals1.3/Seals/insert/__init__.py b/yoshi-seals1.3/Seals/insert/__init__.py index 54364b5..08ffc8f 100644 --- a/yoshi-seals1.3/Seals/insert/__init__.py +++ b/yoshi-seals1.3/Seals/insert/__init__.py @@ -17,7 +17,5 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -name = 'insert' - from .insert import matrix from .insert import vector \ No newline at end of file diff --git a/yoshi-seals1.3/Seals/insert/__pycache__/__init__.cpython-37.pyc b/yoshi-seals1.3/Seals/insert/__pycache__/__init__.cpython-37.pyc index b21875d..60ad7e4 100644 Binary files a/yoshi-seals1.3/Seals/insert/__pycache__/__init__.cpython-37.pyc and b/yoshi-seals1.3/Seals/insert/__pycache__/__init__.cpython-37.pyc differ diff --git a/yoshi-seals1.3/Seals/insert/__pycache__/insert.cpython-37.pyc b/yoshi-seals1.3/Seals/insert/__pycache__/insert.cpython-37.pyc index 2076b37..9bc1b5a 100644 Binary files a/yoshi-seals1.3/Seals/insert/__pycache__/insert.cpython-37.pyc and b/yoshi-seals1.3/Seals/insert/__pycache__/insert.cpython-37.pyc differ diff --git a/yoshi-seals1.3/Seals/insert/insert.py b/yoshi-seals1.3/Seals/insert/insert.py index cebc52f..003e274 100644 --- a/yoshi-seals1.3/Seals/insert/insert.py +++ b/yoshi-seals1.3/Seals/insert/insert.py @@ -19,7 +19,6 @@ def matrix(matrix): - i = 0 while (i < matrix.shape[0]): diff --git a/yoshi-seals1.3/Seals/process/__init__.py b/yoshi-seals1.3/Seals/process/__init__.py index 9afe304..985e6e0 100644 --- a/yoshi-seals1.3/Seals/process/__init__.py +++ b/yoshi-seals1.3/Seals/process/__init__.py @@ -17,8 +17,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -name = 'process' - from .process import identity from .process import gauss from .process import inverse diff --git a/yoshi-seals1.3/Seals/process/__pycache__/__init__.cpython-37.pyc b/yoshi-seals1.3/Seals/process/__pycache__/__init__.cpython-37.pyc index 7842bad..9e70d8d 100644 Binary files a/yoshi-seals1.3/Seals/process/__pycache__/__init__.cpython-37.pyc and b/yoshi-seals1.3/Seals/process/__pycache__/__init__.cpython-37.pyc differ diff --git a/yoshi-seals1.3/Seals/scan/__init__.py b/yoshi-seals1.3/Seals/scan/__init__.py index 2b354f2..c0167ff 100644 --- a/yoshi-seals1.3/Seals/scan/__init__.py +++ b/yoshi-seals1.3/Seals/scan/__init__.py @@ -17,7 +17,5 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -name = 'scan' - from .scan import numpy as np from .scan import pandas as pd \ No newline at end of file diff --git a/yoshi-seals1.3/Seals/scan/__pycache__/__init__.cpython-37.pyc b/yoshi-seals1.3/Seals/scan/__pycache__/__init__.cpython-37.pyc index 6d50d5b..dfa267e 100644 Binary files a/yoshi-seals1.3/Seals/scan/__pycache__/__init__.cpython-37.pyc and b/yoshi-seals1.3/Seals/scan/__pycache__/__init__.cpython-37.pyc differ diff --git a/yoshi-seals1.3/Seals/scan/__pycache__/scan.cpython-37.pyc b/yoshi-seals1.3/Seals/scan/__pycache__/scan.cpython-37.pyc index 057f848..0452701 100644 Binary files a/yoshi-seals1.3/Seals/scan/__pycache__/scan.cpython-37.pyc and b/yoshi-seals1.3/Seals/scan/__pycache__/scan.cpython-37.pyc differ diff --git a/yoshi-seals1.3/Seals/scan/scan.py b/yoshi-seals1.3/Seals/scan/scan.py index 1ec0404..07c5cbd 100644 --- a/yoshi-seals1.3/Seals/scan/scan.py +++ b/yoshi-seals1.3/Seals/scan/scan.py @@ -20,14 +20,26 @@ import numpy as np import pandas as pd -def numpy(self, path): +def numpy(path, sep=None, decimal=None): - df=pd.read_csv(path, sep=';',decimal=",",header=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 -def pandas(self, path): +def pandas(path, sep=None, decimal=None): - return pd.read_csv(path, sep=';',decimal=",") + if sep is None: + sep = "," + + if decimal is None: + decimal = "." + + return pd.read_csv(path, sep=sep, decimal=decimal) diff --git a/yoshi-seals1.3/Seals/write/__init__.py b/yoshi-seals1.3/Seals/write/__init__.py index 6bf064f..90f152d 100644 --- a/yoshi-seals1.3/Seals/write/__init__.py +++ b/yoshi-seals1.3/Seals/write/__init__.py @@ -17,7 +17,5 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -name = 'write' - -from .write import numpy -from .write import pandas \ No newline at end of file +from .write import numpy as np +from .write import pandas as pd \ No newline at end of file diff --git a/yoshi-seals1.3/Seals/write/__pycache__/__init__.cpython-37.pyc b/yoshi-seals1.3/Seals/write/__pycache__/__init__.cpython-37.pyc index 1c309c9..7b0ac6b 100644 Binary files a/yoshi-seals1.3/Seals/write/__pycache__/__init__.cpython-37.pyc and b/yoshi-seals1.3/Seals/write/__pycache__/__init__.cpython-37.pyc differ diff --git a/yoshi-seals1.3/build/lib/Seals/__init__.py b/yoshi-seals1.3/build/lib/Seals/__init__.py index acc6016..e5d934d 100644 --- a/yoshi-seals1.3/build/lib/Seals/__init__.py +++ b/yoshi-seals1.3/build/lib/Seals/__init__.py @@ -15,10 +15,4 @@ # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -from .insert import insert -from .process import process -from .scan import scan -from .write import write -from .eigen import eigen \ No newline at end of file +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. \ No newline at end of file diff --git a/yoshi-seals1.3/build/lib/Seals/insert/__init__.py b/yoshi-seals1.3/build/lib/Seals/insert/__init__.py index 54364b5..08ffc8f 100644 --- a/yoshi-seals1.3/build/lib/Seals/insert/__init__.py +++ b/yoshi-seals1.3/build/lib/Seals/insert/__init__.py @@ -17,7 +17,5 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -name = 'insert' - from .insert import matrix from .insert import vector \ No newline at end of file diff --git a/yoshi-seals1.3/build/lib/Seals/insert/insert.py b/yoshi-seals1.3/build/lib/Seals/insert/insert.py index cebc52f..003e274 100644 --- a/yoshi-seals1.3/build/lib/Seals/insert/insert.py +++ b/yoshi-seals1.3/build/lib/Seals/insert/insert.py @@ -19,7 +19,6 @@ def matrix(matrix): - i = 0 while (i < matrix.shape[0]): diff --git a/yoshi-seals1.3/build/lib/Seals/process/__init__.py b/yoshi-seals1.3/build/lib/Seals/process/__init__.py index 9afe304..985e6e0 100644 --- a/yoshi-seals1.3/build/lib/Seals/process/__init__.py +++ b/yoshi-seals1.3/build/lib/Seals/process/__init__.py @@ -17,8 +17,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -name = 'process' - from .process import identity from .process import gauss from .process import inverse diff --git a/yoshi-seals1.3/build/lib/Seals/scan/__init__.py b/yoshi-seals1.3/build/lib/Seals/scan/__init__.py index 2b354f2..c0167ff 100644 --- a/yoshi-seals1.3/build/lib/Seals/scan/__init__.py +++ b/yoshi-seals1.3/build/lib/Seals/scan/__init__.py @@ -17,7 +17,5 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -name = 'scan' - from .scan import numpy as np from .scan import pandas as pd \ No newline at end of file diff --git a/yoshi-seals1.3/build/lib/Seals/scan/scan.py b/yoshi-seals1.3/build/lib/Seals/scan/scan.py index 1ec0404..07c5cbd 100644 --- a/yoshi-seals1.3/build/lib/Seals/scan/scan.py +++ b/yoshi-seals1.3/build/lib/Seals/scan/scan.py @@ -20,14 +20,26 @@ import numpy as np import pandas as pd -def numpy(self, path): +def numpy(path, sep=None, decimal=None): - df=pd.read_csv(path, sep=';',decimal=",",header=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 -def pandas(self, path): +def pandas(path, sep=None, decimal=None): - return pd.read_csv(path, sep=';',decimal=",") + if sep is None: + sep = "," + + if decimal is None: + decimal = "." + + return pd.read_csv(path, sep=sep, decimal=decimal) diff --git a/yoshi-seals1.3/build/lib/Seals/write/__init__.py b/yoshi-seals1.3/build/lib/Seals/write/__init__.py index 6bf064f..90f152d 100644 --- a/yoshi-seals1.3/build/lib/Seals/write/__init__.py +++ b/yoshi-seals1.3/build/lib/Seals/write/__init__.py @@ -17,7 +17,5 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -name = 'write' - -from .write import numpy -from .write import pandas \ No newline at end of file +from .write import numpy as np +from .write import pandas as pd \ No newline at end of file diff --git a/yoshi-seals1.3/dist/yoshi-seals-1.3.tar.gz b/yoshi-seals1.3/dist/yoshi-seals-1.3.tar.gz index 1bcc2f8..6bc2829 100644 Binary files a/yoshi-seals1.3/dist/yoshi-seals-1.3.tar.gz and b/yoshi-seals1.3/dist/yoshi-seals-1.3.tar.gz differ diff --git a/yoshi-seals1.3/dist/yoshi_seals-1.3-py3-none-any.whl b/yoshi-seals1.3/dist/yoshi_seals-1.3-py3-none-any.whl index fc8e8ce..2e91995 100644 Binary files a/yoshi-seals1.3/dist/yoshi_seals-1.3-py3-none-any.whl and b/yoshi-seals1.3/dist/yoshi_seals-1.3-py3-none-any.whl differ diff --git a/yoshi-seals1.3/yoshi_seals.egg-info/PKG-INFO b/yoshi-seals1.3/yoshi_seals.egg-info/PKG-INFO index 09158f0..b239706 100644 --- a/yoshi-seals1.3/yoshi_seals.egg-info/PKG-INFO +++ b/yoshi-seals1.3/yoshi_seals.egg-info/PKG-INFO @@ -30,7 +30,7 @@ Description: # Seals - Numeric Calculus The module *scan* has a function for *Numpy* arrays and *Pandas* dataframes, and used the following syntax `Seals.scan.np(path)` for *Numpy* and `Seals.scan.pd(path)` for *Pandas*, where `path` is the path to your directory. - The module *write* has a function for *Numpy* arrays and *Pandas* dataframes, and uses the following syntax `Sealswrite.np(array,path)` for *Numpy*, where `array` is the matrix that you desire to output and `path` is the path to your directory, and `Seals.write.pd(df,path)` for *Pandas*, where `df` is the matrix that you desire to output and `path` is the path to your directory. + The module *write* has a function for *Numpy* arrays and *Pandas* dataframes, and uses the following syntax `Seals.write.np(array,path)` for *Numpy*, where `array` is the matrix that you desire to output and `path` is the path to your directory, and `Seals.write.pd(df,path)` for *Pandas*, where `df` is the matrix that you desire to output and `path` is the path to your directory. The module *insert* has a function for *matrix* and another for *vector*, and it has the following syntax `Seals.insert.function(array)`, where `insert` is the *Python Module* and `function` is either a `matrix` or a `vector` and `array` is either a *matrix* or a *vector*.