pyfmtools 5.1__tar.gz → 5.2__tar.gz

{pyfmtools-5.1/src/pyfmtools.egg-info → pyfmtools-5.2}/PKG-INFO

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

{pyfmtools-5.1 → pyfmtools-5.2}/setup.py

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

{pyfmtools-5.1 → pyfmtools-5.2}/src/buildPyfmtools.py

@@ -156,7 +156,7 @@ pyfmtools_src=['src/colamd.c','src/lp_lib.c','src/lp_params.c','src/lp_simplex.c
 
 ffibuilder.set_source("_pyfmtools",r""" #include "wrapperpy.h" """,  
     sources=pyfmtools_src,
-            extra_compile_args=["-Wno-c++11-extensions","-Wno-c++11-long-long","-Wno-unused-but-set-variable","-Wno-sign-compare","-Wno-c++11-extra-semi","-Wno-unreachable-code","-Wno-parentheses-equality","-Wno-empty-body"],
+            extra_compile_args=[],
     include_dirs=[PATH],
     )
     

{pyfmtools-5.1 → pyfmtools-5.2}/src/fuzzymeasuretools.cpp

@@ -1581,7 +1581,7 @@ int GetNumTuples(struct SparseFM* cap)
 int             IsInSetSparse(int A, int card, int i, struct SparseFM* cap)                 // does i belong to set A?
 {
 	if (card == 1) return (A == i);
-	if (card == 2) return((cap->m_pair_index[2 * A] == (uint16_t)i) || (cap->m_pair_index[2 * A + 1] == (uint16_t)i));
+	if (card == 2) return((cap->m_pair_index[2 * A] == (int)i) || (cap->m_pair_index[2 * A + 1] == (int)i));
 	// else process tuple
 	for (int j = 1;j <= cap->m_tuple_content[cap->m_tuple_start[A]]; j++)
 		if (cap->m_tuple_content[cap->m_tuple_start[A] + j] == i) return 1;
@@ -1704,15 +1704,18 @@ void BanzhafMobSparse(double* v, int n, struct SparseFM* cap)
 
 void NonmodularityIndexMobSparse(double* w, int n, int_64 m, struct SparseFM* cap) // calculates  all 2^n nonmodularity indices (returned in w) using Mobius transform of 
 //a k-additive FM in cardinality ordering (of length 2^n=m), using sparse representation
+// returns w in standard representation
 {
 	int_64 id, A;
-	w[0] = 0;
+//	w[0] = 0;	
+	for (int_64 i = (int_64)0; i < m; i++) w[i] = 0;
+	
 	for (int i = 0;i < n; i++)
-		w[i] = cap->m_singletons[i];  // singleton
+		w[1 << i] = cap->m_singletons[i];  // singleton
+
 
-	for (int_64 i = (int_64)n; i < m; i++) w[i] = 0;
 
-	for (id = (int_64)n; id < m; id++)
+	for (id = (int_64)3; id < m; id++) if(Cardinality(id)>1)
 	{
 		for (size_t j = 0;j < cap->m_pairs.size(); j++)
 		{
@@ -1730,7 +1733,9 @@ void NonmodularityIndexMobSparse(double* w, int n, int_64 m, struct SparseFM* ca
 			if (IsSubset(id, A))
 				w[id] += cap->m_tuples[i] * cap->m_tuple_content[cap->m_tuple_start[i]];  // cardinality
 		}
-		w[id] /= card[card2bit[id]];
+	//	w[id] /= card[card2bit[id]];
+    // I am unsure why card2bit? id looks to be  bit order
+        w[id] /= Cardinality(id);
 	}
 }
 
@@ -1742,8 +1747,8 @@ void PopulateFM2Add_Sparse(double* singletons, int numpairs, double* pairs, int*
 
 	for (int i = 0;i < numpairs; i++) {
 		cap->m_pairs.push_back(pairs[i]);
-		cap->m_pair_index.push_back(uint16_t(indicesp1[ i]));
-		cap->m_pair_index.push_back(uint16_t(indicesp2[i]));
+		cap->m_pair_index.push_back(int(indicesp1[ i]));
+		cap->m_pair_index.push_back(int(indicesp2[i]));
 	}
 }
 
@@ -1751,8 +1756,8 @@ void PopulateFM2Add_Sparse(double* singletons, int numpairs, double* pairs, int*
 void AddPairSparse(int i, int j, double* v, struct SparseFM* cap)
 {
 	cap->m_pairs.push_back(*v);
-	cap->m_pair_index.push_back(uint16_t(min(i, j)));
-	cap->m_pair_index.push_back(uint16_t(max(i, j)));
+	cap->m_pair_index.push_back(int(min(i, j)));
+	cap->m_pair_index.push_back(int(max(i, j)));
 }
 void AddTupleSparse(int tupsize, int* tuple, double* v, struct SparseFM* cap)
 {
@@ -1762,7 +1767,7 @@ void AddTupleSparse(int tupsize, int* tuple, double* v, struct SparseFM* cap)
 	cap->m_tuple_content.push_back(tupsize);
 
 	for (int j = 0;j < tupsize;j++) {
-		cap->m_tuple_content.push_back((uint16_t)(tuple[j]));
+		cap->m_tuple_content.push_back((int)(tuple[j]));
 	}
 }
 

{pyfmtools-5.1 → pyfmtools-5.2}/src/generaldefs.h

@@ -7,6 +7,7 @@
 #if defined  (_WIN32)
 #define LIBEXP 	__declspec(dllexport)  
 //#include "../stdafx.h"
+#define WIN32
 #else
 #define LIBEXP 
 #endif

{pyfmtools-5.1 → pyfmtools-5.2/src/pyfmtools.egg-info}/PKG-INFO

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

{pyfmtools-5.1 → pyfmtools-5.2}/src/pyfmtools.egg-info/SOURCES.txt

@@ -3,7 +3,6 @@ MANIFEST.in
 README.md
 setup.cfg
 setup.py
-dist/pyfmtools-5.1-cp312-cp312-macosx_14_0_arm64.whl
 src/binarylattice.h
 src/buildPyfmtools.py
 src/colamd.c
@@ -18,8 +17,6 @@ src/fortify.h
 src/fuzzymeasurefit.cpp
 src/fuzzymeasurefit.h
 src/fuzzymeasurefit3.cpp
-src/fuzzymeasuretools.bak.cpp
-src/fuzzymeasuretools.bak.h
 src/fuzzymeasuretools.cpp
 src/fuzzymeasuretools.h
 src/gbrealloc.c

{pyfmtools-5.1 → pyfmtools-5.2}/src/wrapperpy.cpp

@@ -51,7 +51,7 @@ struct  fm_env_sparse { // to use in wrappers, just to keep pointers. pointers m
 };
 
 
-
+#undef __R
 //#define __R
 #ifdef __R
 //#include "cpp11.hpp"
@@ -68,11 +68,12 @@ struct  fm_env_sparse { // to use in wrappers, just to keep pointers. pointers m
 
 #include <stdlib.h>
 
+#ifdef __R
 //#include "wrapperpy.h"
 
 //#if (defined(__clang__) || defined(__APPLE__) || defined(__arm64__)) && defined(_LIBCPP_VERSION)
 //#if (defined(__clang__) ||  defined(__arm64__)) && defined(_LIBCPP_VERSION)	
-#if  defined(_LIBCPP_VERSION)	// may be just detect libc++
+#if  (defined(_LIBCPP_VERSION) )	// may be just detect libc++
 
 #if (_LIBCPP_VERSION < 14000)
 template <class T>
@@ -174,7 +175,7 @@ void releaseVectorWrapper( std::vector<T,  std::allocator<T> > volatile &targetV
 }
 #endif
 
-
+#endif
 
 //#undef PYTHON_
 
@@ -2642,7 +2643,7 @@ LIBEXP void py_Nonmodularityindex_sparse( double* w, int n, struct fm_env_sparse
 //}  // end extern "C"
 
 
-
+#ifdef __R
 
 void copycontent(struct SparseFM* env, double* singletons, double* pairs, double* tuples, int* pairsidx, int* tuplesidx, int* tuplescon, int* dims)
 {
@@ -2705,7 +2706,7 @@ void copycontent(struct SparseFM* env, double* singletons, double* pairs, double
 
  
  
-
+#endif
  
 
 

{pyfmtools-5.1 → pyfmtools-5.2}/tests/test_wrapper.py

@@ -245,7 +245,7 @@ print( "r: ", r)
 #    void py_FuzzyMeasureFit(int datanum, int additive, struct fm_env* env, double* out_v, double* dataset)
 datanum = 10
 additive = 2
-dataset = [random.random()] * datanum * ( env.n + 1)
+dataset = np.random.uniform(low=0.0, high=1.0, size=(datanum * ( env.n + 1),))
 res = pyfm.FuzzyMeasureFit(datanum, additive, env, dataset)
 print( "datanum: ", datanum)
 print( "additive: ", additive)
@@ -256,7 +256,7 @@ print( "res: ", res)
 #    void py_FuzzyMeasureFitMob(int datanum, int additive, struct fm_env* env, double* out_v, double* dataset)
 datanum = 10
 additive = 3
-dataset = [random.random()] * datanum * ( env.n + 1)
+dataset = np.random.uniform(low=0.0, high=1.0, size=(datanum * ( env.n + 1),))
 res = pyfm.FuzzyMeasureFitMob(datanum, additive, env, dataset)
 print( "datanum: ", datanum)
 print( "additive: ", additive)
@@ -267,7 +267,7 @@ print( "res: ", res)
 #    void py_FuzzyMeasureFitKtolerant(int datanum, int additive, struct fm_env* env, double* out_v, double* dataset)
 datanum = 10
 additive = 2
-dataset = [random.random()] * datanum * ( env.n + 1)
+dataset = np.random.uniform(low=0.0, high=1.0, size=(datanum * ( env.n + 1),))
 res = pyfm.FuzzyMeasureFitKtolerant(datanum, additive, env, dataset)
 print( "datanum: ", datanum)
 print( "additive: ", additive)
@@ -278,7 +278,7 @@ print( "res: ", res)
 #    void py_FuzzyMeasureFitLPKmaxitive(int datanum, int additive, struct fm_env* env, double* out_v, double* dataset)
 datanum = 10
 additive = 2
-dataset = [random.random()] * datanum * ( env.n + 1)
+dataset = np.random.uniform(low=0.0, high=1.0, size=(datanum * ( env.n + 1),))
 res = pyfm.FuzzyMeasureFitLPKmaxitive(datanum, additive, env, dataset)
 print( "datanum: ", datanum)
 print( "additive: ", additive)
@@ -290,7 +290,7 @@ print( "res: ", res)
 datanum = 10
 additive = 2
 K = 0.5
-dataset = [random.random()] * datanum * ( env.n + 1)
+dataset = np.random.uniform(low=0.0, high=1.0, size=(datanum * ( env.n + 1),))
 v = pyfm.FuzzyMeasureFitLPKinteractive(datanum, additive, env, K, dataset)
 print( "datanum: ", datanum)
 print( "additive: ", additive)
@@ -304,7 +304,7 @@ print( "v: ", v)
 datanum = 10
 additive = 2
 K = 0.5
-dataset = [random.random()] * datanum * ( env.n + 1)
+dataset = np.random.uniform(low=0.0, high=1.0, size=(datanum * ( env.n + 1),))
 v = pyfm.FuzzyMeasureFitLPKinteractiveMaxChains(datanum, additive, env, K, dataset)
 print( "datanum: ", datanum)
 print( "additive: ", additive)
@@ -318,7 +318,8 @@ datanum = 10
 additive = 2
 K = 0.5
 maxiters = 100
-dataset = [random.random()] * datanum * ( env.n + 1)
+#dataset = [random.random()] * datanum * ( env.n + 1)
+dataset = np.random.uniform(low=0.0, high=1.0, size=(datanum * ( env.n + 1),))
 v = pyfm.FuzzyMeasureFitLPKinteractiveAutoK(datanum, additive, env, K, maxiters, dataset)
 print( "datanum: ", datanum)
 print( "additive: ", additive)
@@ -333,7 +334,7 @@ datanum = 10
 additive = 2
 K = 0.5
 submod = 1
-dataset = [random.random()] * datanum * ( env.n + 1)
+dataset = np.random.uniform(low=0.0, high=1.0, size=(datanum * ( env.n + 1),))
 v = pyfm.FuzzyMeasureFitLPKinteractiveMarginal(datanum, additive, env,  K, submod, dataset)
 print( "datanum: ", datanum)
 print( "additive: ", additive)
@@ -348,7 +349,7 @@ datanum = 10
 additive = 2
 K = 0.5
 submod = 1
-dataset = [random.random()] * datanum * ( env.n + 1)
+dataset = np.random.uniform(low=0.0, high=1.0, size=(datanum * ( env.n + 1),))
 v = pyfm.FuzzyMeasureFitLPKinteractiveMarginalMaxChain(datanum, additive, env, K, maxiters, submod, dataset)
 print( "datanum: ", datanum)
 print( "additive: ", additive)
@@ -366,7 +367,7 @@ indexlow = [0, 0, 0]
 indexhihg = [1, 1, 1]
 option1 = 0
 orness = 0.5
-dataset = [random.random()] * datanum * ( env.n + 1)
+dataset = np.random.uniform(low=0.0, high=1.0, size=(datanum * ( env.n + 1),))
 v = pyfm.FuzzyMeasureFitLP(datanum, additive, env, options, indexlow, indexhihg, option1, orness, dataset)
 print( "datanum: ", datanum)
 print( "additive: ", additive)
@@ -387,7 +388,7 @@ indexlow = [0, 0, 0]
 indexhihg = [1, 1, 1]
 option1 = 0
 orness = 0.5
-dataset = [random.random()] * datanum * ( env.n + 1)
+dataset = np.random.uniform(low=0.0, high=1.0, size=(datanum * ( env.n + 1),))
 Mob = pyfm.FuzzyMeasureFitLPMob(datanum, additive, env, options, indexlow, indexhihg, option1, orness, dataset)
 print( "datanum: ", datanum)
 print( "additive: ", additive)
@@ -403,7 +404,7 @@ print( "Mob: ", Mob)
 #    void py_fittingOWA(int datanum, struct fm_env* env, double* out_v, double* dataset)
 # documented, no example
 datanum = 10
-dataset = [random.random()] * datanum * ( env.n + 1)
+dataset = np.random.uniform(low=0.0, high=1.0, size=(datanum * ( env.n + 1),))
 v = pyfm.fittingOWA(datanum, env, dataset)
 print( "datanum: ", datanum)
 print( "dataset: ", dataset)
@@ -414,7 +415,7 @@ print( "v: ", v)
 # documented, no example
 datanum = 10
 atanum = 10
-dataset = [random.random()] * datanum * ( env.n + 1)
+dataset = np.random.uniform(low=0.0, high=1.0, size=(datanum * ( env.n + 1),))
 v = pyfm.fittingWAM(datanum, env, dataset)
 print( "datanum: ", datanum)
 print( "dataset: ", dataset)
@@ -774,7 +775,7 @@ env_sparse = pyfm.prepare_fm_sparse( n, tupsize)
 # Test wrapper for:
 #    void py_add_tuple_sparse(int tupsize, int* tuple, double v, struct fm_env_sparse* env)
 v = 0.2
-tuple = [1, 3, 4]
+tuple = [1, 2, 3]
 pyfm.add_tuple_sparse( tuple, v, env_sparse)
 print( "tuple: ", tuple)
 
@@ -796,7 +797,7 @@ print( "Banzhaf values: ", v)
 #    void py_add_pair_sparse(int i, int j, double v, struct fm_env_sparse* env)
 v = 0.2
 i = 2
-j = 5
+j = 3
 pyfm.add_pair_sparse(i, j, v, env_sparse)
 print( "v: ", v)
 print( "i: ", i)
@@ -893,7 +894,7 @@ print( "is_contained: ", is_contained)
 A = 0
 cardA = 3
 B = 1
-cardB = 3
+cardB = 2
 is_subset = pyfm.is_subset_sparse(A, cardA, B, cardB, env_sparse)
 print( "A: ", A)
 print( "cardA: ", cardA)