pyfmtools 5.3.6__tar.gz → 5.3.8__tar.gz

{pyfmtools-5.3.6/src/pyfmtools.egg-info → pyfmtools-5.3.8}/PKG-INFO

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

{pyfmtools-5.3.6 → pyfmtools-5.3.8}/setup.py

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

{pyfmtools-5.3.6 → pyfmtools-5.3.8}/src/fmrandom.h

@@ -182,5 +182,5 @@ LIBDLL_API  int CheckMonMob2additive2(double* Mob, int n, int length, double* te
 LIBDLL_API void ConvertCoMob2Kinter(double* mu, double* Mob, int n, int_64 m, int kadd, int len, int fullmu);
 LIBDLL_API double ChoquetCoMobKInter(double* x, double* Mob, int n, int_64 m, int kadd, int length);
 
-LIBDLL_API int generate_fm_minimals(int_64 num, int n, int ratio, int markov, double* weights, double* vv);
-LIBDLL_API int generate_fm_minimals_le(int_64 num, int n, int ratio, int markov, double* weights, int_64* vv);
+LIBDLL_API int generate_fm_minimals(int_64 num, int n, double ratio, int markov, double* weights, double* vv);
+LIBDLL_API int generate_fm_minimals_le(int_64 num, int n, double ratio, int markov, double* weights, int_64* vv);

{pyfmtools-5.3.6 → pyfmtools-5.3.8}/src/fmrandomsort.inc

@@ -42,6 +42,9 @@ void GenerateOnSimplex1(vector<double>& w, int_64 dim)
 }
 
 double* valuesptr;
+
+LIBDLL_API int generate_fm_balanced(int_64 num, int n, double* vv);
+
 int fm_sortvals(size_t i1, size_t i2)
 {
 	return (valuesptr[i1] < valuesptr[i2]);
@@ -80,21 +83,41 @@ LIBDLL_API int generate_fm_sorting01(int_64 num, int n, int markov, int option,
 		for (int_64 A = 0; A < m; ++A) bitswapped[A] = swapbits(A, perm, n);
 
 		// Step 1. 
-		int V = RanVertex(rng);   // we use V vertices here
-		for (int i = 0; i < V * MaxAntichain; i++) Vertices[i] = RanUG(rng);
-		for (int i = 0; i < V; i++) VertexLen[i] = RanLen(rng);
-		// vertices of random compositions
-		iota(subsets.begin(), subsets.end(), 0); // assign values 0,1,2,3,\ldots
-		GenerateOnSimplex1(weights, V);    // V weights that sum to one
-		for (int_64 A = 1; A < m - 1; A++) {    // for each subset of N
-			values[A] = 0;
-			for (int v = 0; v < V; v++) {
-				int flag = 0;
-				for (int ug = 0; ug < VertexLen[v]; ug++)
-					if (IsSubset(A, Vertices[ug + v * V])) flag = 1;  // mu(A)=1
-				if (flag) values[A] += weights[v];  // convex combination of vertices
+		if (option == 0) {
+			int V = RanVertex(rng);   // we use V vertices here
+			for (int i = 0; i < V * MaxAntichain; i++) Vertices[i] = RanUG(rng);
+			for (int i = 0; i < V; i++) VertexLen[i] = RanLen(rng);
+			// vertices of random compositions
+			iota(subsets.begin(), subsets.end(), 0); // assign values 0,1,2,3,\ldots
+			GenerateOnSimplex1(weights, V);    // V weights that sum to one
+			for (int_64 A = 1; A < m - 1; A++) {    // for each subset of N
+				values[A] = 0;
+				for (int v = 0; v < V; v++) {
+					int flag = 0;
+					for (int ug = 0; ug < VertexLen[v]; ug++)
+						if (IsSubset(A, Vertices[ug + v * V])) flag = 1;  // mu(A)=1
+					if (flag) values[A] += weights[v];  // convex combination of vertices
+				}
 			}
 		}
+		  else //option==1
+		  {
+		  //just take random combination of balanced with very unbalanced
+		  iota(subsets.begin(), subsets.end(), 0);
+		  double p = distribution(rng);
+
+		  vector<double> bal(m);
+		  generate_fm_balanced(1, n, bal.data());
+		  for (int_64 i = 1; i < m - 1; i++) 	values[i] = distribution(rng);
+		  values[0] = -0.1; values[m - 1] = 1.1;
+
+		  sort(values.begin(), values.end(), less<double>());
+		  values[0] = 0;	values[m - 1] = 1;
+		  // this is unbalanced
+
+		  for (int_64 i = 1; i < m - 1; i++) values[i] = values[i] * p + (1 - p) * bal[bit2card[i]];
+
+		  }
 		values[0] = 0;	values[m - 1] = 1; // empty set and N
 
 

{pyfmtools-5.3.6 → pyfmtools-5.3.8/src/pyfmtools.egg-info}/PKG-INFO

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