pyfmtools 5.3.2__tar.gz → 5.3.4__tar.gz

{pyfmtools-5.3.2/src/pyfmtools.egg-info → pyfmtools-5.3.4}/PKG-INFO

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

{pyfmtools-5.3.2 → pyfmtools-5.3.4}/setup.py

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

{pyfmtools-5.3.2 → pyfmtools-5.3.4}/src/buildPyfmtools.py

@@ -147,8 +147,8 @@ ffibuilder.cdef(r"""
  int py_generate_fm_kinteractivedualconvex(int num, int n, int kint, int markov, int option, double step,  double * vv, struct fm_env* env, void* extrachecks);
  int py_generate_fm_kinteractivedualconcave(int num, int n, int kint, int markov, int option, double step,  double * vv, struct fm_env* env, void* extrachecks);
  int py_generate_fm_2additive_randomwalk2(int num, int n, int markov, int option, double step,  double * vv, void* extrachecks);
- int py_generate_fm_minimals_le(int num, int n, int markov, double ratio, int_64* vv, struct fm_env* env);
- int py_generate_fm_minimals(int num, int n, int markov, double ratio, double* vv, struct fm_env* env);
+ int py_generate_fm_minimals_le(int num, int n, int markov, double ratio, double* weights, int_64* vv, struct fm_env* env);
+ int py_generate_fm_minimals(int num, int n, int markov, double ratio, double* weights, double* vv, struct fm_env* env);
     """, override=True)
 
 pyfmtools_src=['src/colamd.c','src/lp_lib.c','src/lp_params.c','src/lp_simplex.c','src/lusolio.c','src/commonlib.c','src/lp_LUSOL.c','src/lp_presolve.c','src/lpslink56.c','src/mmio.c',

{pyfmtools-5.3.2 → pyfmtools-5.3.4}/src/fmrandomsort.inc

@@ -2006,7 +2006,7 @@ void PutIntoMinimals(vector<int_64>& minimals, vector<int_64>& freespaces, int_6
 }
 
 
-void Minimals_fast(int_64 num, int n, int_64 m, int_64* LE, int* weights)
+void Minimals_fast(int_64 num, int n, int_64 m, int_64* LE, double* weights)
 {
 	// just generate LEs, make FM outside
 
@@ -2015,7 +2015,7 @@ void Minimals_fast(int_64 num, int n, int_64 m, int_64* LE, int* weights)
 	vector<int_64> freespaces;
 	vector<int_64> current(m);
 
-	int maxweight = 1;
+	double maxweight = 1;
 	if (weights != NULL) for (int i = 0; i < n; i++) if (maxweight < weights[i]) maxweight = weights[i];
 
 	for (int_64 Num = 0; Num < num; Num++) {
@@ -2117,14 +2117,14 @@ void Minimals_fastreshuffle(int_64 num, int n, int_64 m, int markov, int_64* LE,
 	}
 }
 
-LIBDLL_API int generate_fm_minimals_le(int_64 num, int n, int ratio, int markov, int_64* vv)
+LIBDLL_API int generate_fm_minimals_le(int_64 num, int n, double ratio, int markov, double* weights, int_64* vv)
 {
 	int_64 m = 1ULL << n;
 
 	int_64 num1 = num * ratio;
 	int_64 num2 = num - num1;
 
-	Minimals_fastreshuffle(num1, n, m, markov, vv, NULL);
+	Minimals_fastreshuffle(num1, n, m, markov, vv, weights);
 	Balanced_LE(num2, n, m, markov,  &(vv[m * num1]));
 	return 1;
 }
@@ -2144,12 +2144,12 @@ void random_coefficientsup(int n, vector<double>& c)
 	c[0] = 0; c[n - 1] = 1;
 }
 
-LIBDLL_API int generate_fm_minimals(int_64 num, int n, int ratio, int markov, double* vv)
+LIBDLL_API int generate_fm_minimals(int_64 num, int n, double ratio, int markov, double* weights, double* vv)
 {
 	int_64 m = 1ULL << n;
 	vector<int_64> LE(m*num);
 	vector<myfloat> v(m);
-	generate_fm_minimals_le(num, n, ratio, markov, LE.data());
+	generate_fm_minimals_le(num, n, ratio, markov, weights, LE.data());
 
 	for (int_64 k = 0; k < num; k++) {
 		random_coefficientsup(m, v);
@@ -2157,4 +2157,4 @@ LIBDLL_API int generate_fm_minimals(int_64 num, int n, int ratio, int markov, do
 	}
 
 	return 1;
-}
+}

{pyfmtools-5.3.2 → pyfmtools-5.3.4/src/pyfmtools.egg-info}/PKG-INFO

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

{pyfmtools-5.3.2 → pyfmtools-5.3.4}/src/pyfmtools.py

@@ -1538,26 +1538,28 @@ def FuzzyMeasureFit2Additive(datanum, n, options, indexlow, indexhihg, option1,
     return pout_vnp
 
 
-def generate_fm_minimals( num, n , markov, ratio,  env):
+def generate_fm_minimals( num, n , markov, ratio, weights, env):
     trace( "int generate_fm_minimals( num, n , markov, ratio,  env)")
     try:
+        ppW, pW = convert_py_float_to_cffi( weights) #can be None
         length = pow(2,n)
         pout_vvnp, pout_vv = create_float_zeros_as_CFFI_double( num * length)
 
-        fm.py_generate_fm_minimals(num, n, markov, ratio,  pout_vv, env)
+        fm.py_generate_fm_minimals(num, n, markov, ratio, pW, pout_vv, env)
         return  pout_vvnp
         
     except ValueError:
         raise
 
-def generate_fm_minimals_le( num, n , markov, ratio,  env):
+def generate_fm_minimals_le( num, n , markov, ratio, weights, env):
     trace( "int generate_fm_minimals_le( num, n , markov, ratio,  env)")
     try:
+        ppW, pW = convert_py_float_to_cffi( weights) #can be None
         length = pow(2,n)
         pout_vvnp, pout_vv = create_zeros_as_CFFI_uint64( num * length)
         # these are int_64
-        fm.py_generate_fm_minimals_le(num, n, markov, ratio,  pout_vv, env)
+        fm.py_generate_fm_minimals_le(num, n, markov, ratio, pW, pout_vv, env)
         return  pout_vvnp
         
     except ValueError:
-        raise
+        raise

{pyfmtools-5.3.2 → pyfmtools-5.3.4}/src/wrapperpy.cpp

@@ -1,5 +1,6 @@
 //
-/* This is a C-wrapper for fmtools library 
+//
+/* This is a C-wrapper for fmtools library
 
    Gleb Beliakov, 2020
 */
@@ -2216,7 +2217,7 @@ int* Rcard, int* Rcardpos, double* Rbit2card, double* Rcard2bit, double* Rfactor
 	 int_64 num1=*num;		
 	 *out= generate_fm_balanced(num1, *n,  vv);
  }
- void generate_fm_minimals_Call(int* num, int* n, int* markov, double* ratio, double* vv, int* out,
+ void generate_fm_minimals_Call(int* num, int* n, int* markov, double* ratio, double* weights, double* vv, int* out,
 	 int* m, int* Rcard, int* Rcardpos, double* Rbit2card, double* Rcard2bit, double* Rfactorials)
  {
 	 //int_64 mm = (int_64)*m;
@@ -2227,9 +2228,9 @@ int* Rcard, int* Rcardpos, double* Rbit2card, double* Rcard2bit, double* Rfactor
 	 m_factorials = Rfactorials;
 
 	 int_64 num1 = *num;
-	 *out = generate_fm_minimals(num1, *n, *ratio, *markov, vv);
+	 *out = generate_fm_minimals(num1, *n, *ratio, *markov, weights, vv);
  }
- void generate_fm_minimals_le_Call(int* num, int* n, int* markov, double* ratio, int_64* vv, int* out,
+ void generate_fm_minimals_le_Call(int* num, int* n, int* markov, double* ratio, double* weights, int_64* vv, int* out,
 	 int* m, int* Rcard, int* Rcardpos, double* Rbit2card, double* Rcard2bit, double* Rfactorials)
  {
 	 //int_64 mm = (int_64)*m;
@@ -2240,7 +2241,7 @@ int* Rcard, int* Rcardpos, double* Rbit2card, double* Rcard2bit, double* Rfactor
 	 m_factorials = Rfactorials;
 
 	 int_64 num1 = *num;
-	 *out = generate_fm_minimals_le(num1, *n, *ratio, *markov, vv);
+	 *out = generate_fm_minimals_le(num1, *n, *ratio, *markov, weights, vv);
  }
 
 
@@ -2423,16 +2424,16 @@ LIBEXP int py_generate_fm_balanced(int num, int n,  double * vv, struct fm_env*
 	return out;
 }
 
-LIBEXP int py_generate_fm_minimals_le(int num, int n, int markov, double ratio, int_64* vv, struct fm_env* env)
+LIBEXP int py_generate_fm_minimals_le(int num, int n, int markov, double ratio, double* weights, int_64* vv, struct fm_env* env)
 {
 	int out; //length, or not needed?
-	generate_fm_minimals_le_Call(&num, &n, &markov, &ratio, vv, &out, &(env->m), env->card, env->cardpos, env->bit2card, env->card2bit, env->factorials);
+	generate_fm_minimals_le_Call(&num, &n, &markov, &ratio, weights, vv, &out, &(env->m), env->card, env->cardpos, env->bit2card, env->card2bit, env->factorials);
 	return out;
 }
-LIBEXP int py_generate_fm_minimals(int num, int n, int markov, double ratio, double* vv, struct fm_env* env)
+LIBEXP int py_generate_fm_minimals(int num, int n, int markov, double ratio, double* weights, double* vv, struct fm_env* env)
 {
 	int out; //length, or not needed?
-	generate_fm_minimals_Call(&num, &n, &markov, &ratio, vv, &out, &(env->m), env->card, env->cardpos, env->bit2card, env->card2bit, env->factorials);
+	generate_fm_minimals_Call(&num, &n, &markov, &ratio, weights, vv, &out, &(env->m), env->card, env->cardpos, env->bit2card, env->card2bit, env->factorials);
 	return out;
 }
 

{pyfmtools-5.3.2 → pyfmtools-5.3.4}/src/wrapperpy.h

@@ -396,9 +396,9 @@ LIBEXP int py_generate_fm_kinteractivedualconcave(int num, int n, int kint, int
 
 LIBEXP int py_generate_fm_2additive_randomwalk2(int num, int n, int markov, int option, double step,  double * vv, void* extrachecks);
 
-LIBEXP int py_generate_fm_minimals_le(int num, int n, int markov, double ratio, int_64* vv, struct fm_env* env);
+LIBEXP int py_generate_fm_minimals_le(int num, int n, int markov, double ratio, double* weights, int_64* vv, struct fm_env* env);
 
-LIBEXP int py_generate_fm_minimals(int num, int n, int markov, double ratio, double* vv, struct fm_env* env);
+LIBEXP int py_generate_fm_minimals(int num, int n, int markov, double ratio, double* weights, double* vv, struct fm_env* env);