pyfmtools 0.78__tar.gz → 0.80__tar.gz

{pyfmtools-0.78/src/pyfmtools.egg-info → pyfmtools-0.80}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyfmtools
-Version: 0.78
+Version: 0.80
 Summary: Library for handling and fitting fuzzy measures
 Home-page: UNKNOWN
 Author: Gleb Beliakov, Norbert Henseler

{pyfmtools-0.78 → pyfmtools-0.80}/setup.py

@@ -10,7 +10,7 @@ with open("README.md", "r") as fh:
 
 setup( 
     name="pyfmtools",
-    version="0.78",
+    version="0.80",
     description="Library for handling and fitting fuzzy measures",
     long_description=open('README.md').read(),
     long_description_content_type="text/markdown",

{pyfmtools-0.78 → pyfmtools-0.80/src/pyfmtools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyfmtools
-Version: 0.78
+Version: 0.80
 Summary: Library for handling and fitting fuzzy measures
 Home-page: UNKNOWN
 Author: Gleb Beliakov, Norbert Henseler

{pyfmtools-0.78 → pyfmtools-0.80}/src/pyfmtools.egg-info/SOURCES.txt

@@ -2,7 +2,7 @@ LICENSE.txt
 MANIFEST.in
 README.md
 setup.py
-dist/pyfmtools-0.78-cp39-cp39-macosx_10_9_x86_64.whl
+dist/pyfmtools-0.80-cp39-cp39-macosx_10_9_x86_64.whl
 src/binarylattice.h
 src/buildPyfmtools.py
 src/colamd.c

{pyfmtools-0.78 → pyfmtools-0.80}/src/pyfmtools.py

@@ -172,23 +172,63 @@ def create_float_zeros_as_CFFI_double( n):
     px = ffi.cast( "double *", x.ctypes.data)
     return x, px
 
+
+# version of the function using np.ascontiguousarray() 
+def convert_py_float_to_cffi_cont( x):
+    if x is not None:
+        if isinstance( x, np.ndarray) and ( x.flags.c_contiguous == True) and ( x.dtype == np.float64):
+            px = x
+        else:
+            px =  np.ascontiguousarray( x, dtype = 'float64')
+        pxcffi = ffi.cast( "double *", px.ctypes.data)
+    else:
+        # handle None
+        px = np.array( 0)
+        pxcffi = ffi.cast( "double *", 0)
+    return px, pxcffi
+
+# version of the function using np.array() 
 def convert_py_float_to_cffi( x):
-    if isinstance( x, np.ndarray) == True:
-        px = x
+    if x is not None:
+        if isinstance( x, np.ndarray) and ( x.flags.c_contiguous == True) and ( x.dtype == np.float64):
+            px = x
+        else:
+            px =  np.array( x, dtype = 'float64')
+        pxcffi = ffi.cast( "double *", px.ctypes.data)
     else:
-        px = np.array( x)
-        if px.dtype != "float64": px = px.astype( float)
-    pxcffi = ffi.cast( "double *", px.ctypes.data)
+        # handle None
+        px = np.array( 0)
+        pxcffi = ffi.cast( "double *", 0)
     return px, pxcffi
 
+# version of the function using np.ascontiguousarray() 
+def convert_py_int_to_cffi_cont( x):
+    if x is not None:
+        if isinstance( x, np.ndarray) and ( x.flags.c_contiguous == True) and ( x.dtype == np.int32):
+            px = x
+        else:
+            px =  np.ascontiguousarray( x, dtype = 'int32')
+        pxcffi = ffi.cast( "int *", px.ctypes.data)
+    else:
+        # handle None
+        px = np.array( 0)
+        pxcffi = ffi.cast( "int *", 0)
+    return px, pxcffi
 
+# version of the function using np.array() 
 def convert_py_int_to_cffi( x):
-    x = np.intc( x)
-    px = np.array( x)
-    pxcffi = ffi.cast( "int *", px.ctypes.data)
+    if x is not None:
+        if isinstance( x, np.ndarray) and ( x.flags.c_contiguous == True) and ( x.dtype == np.int32):
+            px = x
+        else:
+            px =  np.array( x, dtype = 'int32')
+        pxcffi = ffi.cast( "int *", px.ctypes.data)
+    else:
+        # handle None
+        px = np.array( 0)
+        pxcffi = ffi.cast( "int *", 0)
     return px, pxcffi
 
-
 ###
 # The python minimum wrapper for py_ functions from wrapper.cpp
 ###
@@ -486,7 +526,7 @@ def Entropy(v, env):
 def FuzzyMeasureFit(datanum, additive, env, dataset):
     trace( "void py_FuzzyMeasureFit(int datanum, int additive, struct fm_env* env, double* out_v, double* dataset)")
     pout_vnp, pout_v = create_float_zeros_as_CFFI_double( env.m)
-    pdatasetnp, pdataset = convert_py_float_to_cffi( dataset)
+    pdatasetnp, pdataset = convert_py_float_to_cffi_cont( dataset)
     fm.py_FuzzyMeasureFit( datanum, additive, env, pout_v, pdataset)
     return pout_vnp
 
@@ -496,7 +536,7 @@ def FuzzyMeasureFit(datanum, additive, env, dataset):
 def FuzzyMeasureFitMob(datanum, additive, env, dataset):
     trace( "void py_FuzzyMeasureFitMob(int datanum, int additive, struct fm_env* env, double* out_v, double* dataset)")
     pout_vnp, pout_v = create_float_zeros_as_CFFI_double( env.m)
-    pdatasetnp, pdataset = convert_py_float_to_cffi( dataset)
+    pdatasetnp, pdataset = convert_py_float_to_cffi_cont( dataset)
     fm.py_FuzzyMeasureFitMob( datanum, additive, env, pout_v, pdataset)
     return pout_vnp
 
@@ -506,7 +546,7 @@ def FuzzyMeasureFitMob(datanum, additive, env, dataset):
 def FuzzyMeasureFitKtolerant(datanum, additive, env, dataset):
     trace( "void py_FuzzyMeasureFitKtolerant(int datanum, int additive, struct fm_env* env, double* out_v, double* dataset)")
     pout_vnp, pout_v = create_float_zeros_as_CFFI_double( env.m)
-    pdatasetnp, pdataset = convert_py_float_to_cffi( dataset)
+    pdatasetnp, pdataset = convert_py_float_to_cffi_cont( dataset)
     fm.py_FuzzyMeasureFitKtolerant( datanum, additive, env, pout_v, pdataset)
     return pout_vnp
 
@@ -516,7 +556,7 @@ def FuzzyMeasureFitKtolerant(datanum, additive, env, dataset):
 def FuzzyMeasureFitLPKmaxitive(datanum, additive, env, dataset):
     trace( "void py_FuzzyMeasureFitLPKmaxitive(int datanum, int additive, struct fm_env* env, double* out_v, double* dataset)")
     pout_vnp, pout_v = create_float_zeros_as_CFFI_double( env.m)
-    pdatasetnp, pdataset = convert_py_float_to_cffi( dataset)
+    pdatasetnp, pdataset = convert_py_float_to_cffi_cont( dataset)
     fm.py_FuzzyMeasureFitLPKmaxitive( datanum, additive, env, pout_v, pdataset)
     return pout_vnp
 
@@ -526,8 +566,8 @@ def FuzzyMeasureFitLPKmaxitive(datanum, additive, env, dataset):
 def FuzzyMeasureFitLPKinteractive(datanum, additive, env, K, dataset):
     trace( "void py_FuzzyMeasureFitLPKinteractive(int datanum, int additive, struct fm_env* env, double* out_v, double* dataset, double* K)")
     pout_vnp, pout_v = create_float_zeros_as_CFFI_double( env.m)
-    pdatasetnp, pdataset = convert_py_float_to_cffi( dataset)
-    pKnp, pK = convert_py_float_to_cffi( K)
+    pdatasetnp, pdataset = convert_py_float_to_cffi_cont( dataset)
+    pKnp, pK = convert_py_float_to_cffi_cont( K)
     fm.py_FuzzyMeasureFitLPKinteractive( datanum, additive, env, pout_v, pdataset, pK)
     return pout_vnp
 
@@ -548,9 +588,9 @@ def FuzzyMeasureFitLPKinteractiveMaxChains(datanum, additive, env, K, dataset):
 def FuzzyMeasureFitLPKinteractiveAutoK(datanum, additive, env, K, maxiters, dataset):
     trace( "void py_FuzzyMeasureFitLPKinteractiveAutoK(int datanum, int additive, struct fm_env* env, double* out_v, double* dataset, double* K, int* maxiters)")
     pout_vnp, pout_v = create_float_zeros_as_CFFI_double( env.m)
-    pdatasetnp, pdataset = convert_py_float_to_cffi( dataset)
-    pKnp, pK = convert_py_float_to_cffi( K)
-    pmaxitersnp, pmaxiters = convert_py_int_to_cffi( maxiters)
+    pdatasetnp, pdataset = convert_py_float_to_cffi_cont( dataset)
+    pKnp, pK = convert_py_float_to_cffi_cont( K)
+    pmaxitersnp, pmaxiters = convert_py_int_to_cffi_cont( maxiters)
     fm.py_FuzzyMeasureFitLPKinteractiveAutoK( datanum, additive, env, pout_v, pdataset, pK, pmaxiters)
     return pout_vnp
 
@@ -560,8 +600,8 @@ def FuzzyMeasureFitLPKinteractiveAutoK(datanum, additive, env, K, maxiters, data
 def FuzzyMeasureFitLPKinteractiveMarginal(datanum, additive, env, K, submod, dataset):
     trace( "void py_FuzzyMeasureFitLPKinteractiveMarginal(int datanum, int additive, struct fm_env* env, double* out_v, double* dataset, double* K, int submod)")
     pout_vnp, pout_v = create_float_zeros_as_CFFI_double( env.m)
-    pdatasetnp, pdataset = convert_py_float_to_cffi( dataset)
-    pKnp, pK = convert_py_float_to_cffi( K)
+    pdatasetnp, pdataset = convert_py_float_to_cffi_cont( dataset)
+    pKnp, pK = convert_py_float_to_cffi_cont( K)
     fm.py_FuzzyMeasureFitLPKinteractiveMarginal( datanum, additive, env, pout_v, pdataset, pK, submod)
     return pout_vnp
 
@@ -569,9 +609,9 @@ def FuzzyMeasureFitLPKinteractiveMarginal(datanum, additive, env, K, submod, dat
 def FuzzyMeasureFitLPKinteractiveMarginalMaxChain(datanum, additive, env, K, maxiters, submod, dataset):
     trace( "void py_FuzzyMeasureFitLPKinteractiveMarginalMaxChain(int datanum, int additive, struct fm_env* env, double* out_v, double* dataset, double* K, int* maxiters, int submod)")
     pout_vnp, pout_v = create_float_zeros_as_CFFI_double( env.m)
-    pdatasetnp, pdataset = convert_py_float_to_cffi( dataset)
-    pKnp, pK = convert_py_float_to_cffi( K)
-    pmaxitersnp, pmaxiters = convert_py_int_to_cffi( maxiters)
+    pdatasetnp, pdataset = convert_py_float_to_cffi_cont( dataset)
+    pKnp, pK = convert_py_float_to_cffi_cont( K)
+    pmaxitersnp, pmaxiters = convert_py_int_to_cffi_cont( maxiters)
     fm.py_FuzzyMeasureFitLPKinteractiveMarginalMaxChain( datanum, additive, env, pout_v, pdataset, pK, pmaxiters, submod)
     return pout_vnp
 
@@ -580,12 +620,12 @@ def FuzzyMeasureFitLPKinteractiveMarginalMaxChain(datanum, additive, env, K, max
 def FuzzyMeasureFitLP(datanum, additive, env, options, indexlow, indexhihg, option1, orness, dataset):
     trace( "void py_FuzzyMeasureFitLP(int datanum, int additive, struct fm_env* env, double* out_v, double* dataset, int* options, double* indexlow, double* indexhihg, int* option1, double* orness)")
     pout_vnp, pout_v = create_float_zeros_as_CFFI_double( env.m)
-    pdatasetnp, pdataset = convert_py_float_to_cffi( dataset)
-    poptionsnp, poptions = convert_py_int_to_cffi( options)
-    pindexlownp, pindexlow = convert_py_float_to_cffi( indexlow)
-    pindexhihgnp, pindexhihg = convert_py_float_to_cffi( indexhihg)
-    poption1np, poption1 = convert_py_int_to_cffi( option1)
-    pornessnp, porness = convert_py_float_to_cffi( orness)
+    pdatasetnp, pdataset = convert_py_float_to_cffi_cont( dataset)
+    poptionsnp, poptions = convert_py_int_to_cffi_cont( options)
+    pindexlownp, pindexlow = convert_py_float_to_cffi_cont( indexlow)
+    pindexhihgnp, pindexhihg = convert_py_float_to_cffi_cont( indexhihg)
+    poption1np, poption1 = convert_py_int_to_cffi_cont( option1)
+    pornessnp, porness = convert_py_float_to_cffi_cont( orness)
     fm.py_FuzzyMeasureFitLP( datanum, additive, env, pout_v, pdataset, poptions, pindexlow, pindexhihg, poption1, porness)
     return pout_vnp
 
@@ -594,12 +634,12 @@ def FuzzyMeasureFitLP(datanum, additive, env, options, indexlow, indexhihg, opti
 def FuzzyMeasureFitLPMob(datanum, additive, env, options, indexlow, indexhihg, option1, orness, dataset):
     trace( "void py_FuzzyMeasureFitLPMob(int datanum, int additive, struct fm_env* env, double* out_v, double* dataset, int* options, double* indexlow, double* indexhihg, int* option1, double* orness)")
     pout_vnp, pout_v = create_float_zeros_as_CFFI_double( env.m)
-    pdatasetnp, pdataset = convert_py_float_to_cffi( dataset)
-    poptionsnp, poptions = convert_py_int_to_cffi( options)
-    pindexlownp, pindexlow = convert_py_float_to_cffi( indexlow)
-    pindexhihgnp, pindexhihg = convert_py_float_to_cffi( indexhihg)
-    poption1np, poption1 = convert_py_int_to_cffi( option1)
-    pornessnp, porness = convert_py_float_to_cffi( orness)
+    pdatasetnp, pdataset = convert_py_float_to_cffi_cont( dataset)
+    poptionsnp, poptions = convert_py_int_to_cffi_cont( options)
+    pindexlownp, pindexlow = convert_py_float_to_cffi_cont( indexlow)
+    pindexhihgnp, pindexhihg = convert_py_float_to_cffi_cont( indexhihg)
+    poption1np, poption1 = convert_py_int_to_cffi_cont( option1)
+    pornessnp, porness = convert_py_float_to_cffi_cont( orness)
     fm.py_FuzzyMeasureFitLPMob( datanum, additive, env, pout_v, pdataset, poptions, pindexlow, pindexhihg, poption1, porness)
     return pout_vnp
 
@@ -608,7 +648,7 @@ def FuzzyMeasureFitLPMob(datanum, additive, env, options, indexlow, indexhihg, o
 def fittingOWA(datanum, env, dataset):
     trace( "void py_fittingOWA(int datanum, struct fm_env* env, double* out_v, double* dataset)")
     pout_vnp, pout_v = create_float_zeros_as_CFFI_double( env.m)
-    pdatasetnp, pdataset = convert_py_float_to_cffi( dataset)
+    pdatasetnp, pdataset = convert_py_float_to_cffi_cont( dataset)
     fm.py_fittingOWA( datanum, env, pout_v, pdataset)
     return pout_vnp, dataset
 
@@ -617,7 +657,7 @@ def fittingOWA(datanum, env, dataset):
 def fittingWAM(datanum, env, dataset):
     trace( "void py_fittingWAM(int datanum, struct fm_env* env, double* out_v, double* dataset)")
     pout_vnp, pout_v = create_float_zeros_as_CFFI_double( env.m)
-    pdatasetnp, pdataset = convert_py_float_to_cffi( dataset)
+    pdatasetnp, pdataset = convert_py_float_to_cffi_cont( dataset)
     fm.py_fittingWAM( datanum, env, pout_v, pdataset)
     return pout_vnp