v1.3
This commit is contained in:
@@ -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
|
||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
@@ -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
|
||||
@@ -19,7 +19,6 @@
|
||||
|
||||
def matrix(matrix):
|
||||
|
||||
|
||||
i = 0
|
||||
|
||||
while (i < matrix.shape[0]):
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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
|
||||
from .write import numpy as np
|
||||
from .write import pandas as pd
|
||||
Reference in New Issue
Block a user