pyfmtools 5.2__tar.gz → 5.2.1__tar.gz

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

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

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

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

{pyfmtools-5.2 → pyfmtools-5.2.1}/src/fmrandomsort.inc

@@ -1229,11 +1229,11 @@ LIBDLL_API int generate_fm_belief(int_64 num, int n, int kadd, int_64* length,
 
 	vector<double> v1(*length);
 	for (int_64 k = 0; k < num; k++) {
-		GenerateBeliefMob(n, *length, v1); // in Mobius! with no 0
+		GenerateBeliefMob(n, *length-1, v1); // in Mobius! with no 0
 		
 		vv[0+ (*length)*k] = 0;
 
-		for (int i = 0; i < *length; i++)
+		for (int i = 0; i < *length-1; i++)
 			vv[i + 1 + (*length) * k] = v1[i]; // last one?
 	}
 	return 1;

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

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

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

@@ -158,6 +158,11 @@ void releaseVectorWrapper( std::vector<T,  std::allocator<T> > volatile &targetV
 #endif
 
 #else
+	
+#if ( _MSC_VER>1)
+#include <crtversion.h>
+#endif
+#if (_VC_CRT_MAJOR_VERSION<13)
 
 template <class T>
 void wrapArrayInVector( T *sourceArray, size_t arraySize, std::vector<T,  std::allocator<T> > volatile &targetVector ) {
@@ -173,6 +178,23 @@ void releaseVectorWrapper( std::vector<T,  std::allocator<T> > volatile &targetV
         (typename std::_Vector_base<T, std::allocator<T> >::_Vector_impl *)((void *) &targetVector);
   vectorPtr->_M_start = vectorPtr->_M_finish = vectorPtr->_M_end_of_storage = NULL;
 }
+#else
+	// just copy
+template <class T>
+void wrapArrayInVector( T *sourceArray, size_t arraySize, std::vector<T,  std::allocator<T> > volatile &targetVector ) {
+  typename std::vector<T, std::allocator<T> > *vectorPtr =
+    (typename std::vector<T, std::allocator<T> > *)((void *) &targetVector);
+	
+	vectorPtr->assign(sourceArray, sourceArray+ arraySize);
+}
+template <class T>
+void releaseVectorWrapper( std::vector<T,  std::allocator<T> > volatile &targetVector )
+{
+	// do nothing 
+	return ;
+}
+#endif
+
 #endif
 
 #endif