pyfmtools 5.3.4__tar.gz → 5.3.6__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {pyfmtools-5.3.4/src/pyfmtools.egg-info → pyfmtools-5.3.6}/PKG-INFO +1 -1
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/setup.py +1 -1
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/fmrandom.h +2 -2
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/fmrandomsort.inc +1 -1
- {pyfmtools-5.3.4 → pyfmtools-5.3.6/src/pyfmtools.egg-info}/PKG-INFO +1 -1
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/LICENSE.txt +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/MANIFEST.in +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/README.md +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/setup.cfg +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/binarylattice.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/buildPyfmtools.py +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/colamd.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/colamd.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/commonlib.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/commonlib.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/declare.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/fmrandom.cpp +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/fortify.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/fuzzymeasurefit.cpp +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/fuzzymeasurefit.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/fuzzymeasurefit3.cpp +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/fuzzymeasuretools.cpp +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/fuzzymeasuretools.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/gbrealloc.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/generaldefs.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/hbio.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/ini.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/ini.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/isfixedvar.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_BFP.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_BFP1.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_BFP2.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_Hash.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_Hash.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_LUSOL.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_LUSOL.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_MDO.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_MDO.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_MPS.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_MPS.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_SOS.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_SOS.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_crash.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_crash.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_etaPFI.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_explicit.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_fortify.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_lib.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_lib.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_matrix.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_matrix.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_mipbb.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_mipbb.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_params.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_presolve.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_presolve.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_price.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_price.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_pricePSE.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_pricePSE.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_report.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_report.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_rlp.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_scale.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_scale.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_simplex.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_simplex.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_types.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_utils.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_utils.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_wlp.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lp_wlp.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lpkit.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lpslink56.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lpsolve.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lusol.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lusol.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lusol1.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lusol2.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lusol6a.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lusol6l0.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lusol6u.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lusol7a.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lusol8a.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lusolio.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/lusolio.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/minimalsplus.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/mmio.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/mmio.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/myblas.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/myblas.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/pyfmtools.egg-info/SOURCES.txt +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/pyfmtools.egg-info/dependency_links.txt +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/pyfmtools.egg-info/requires.txt +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/pyfmtools.egg-info/top_level.txt +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/pyfmtools.py +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/sparselib.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/sparselib.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/stdafx.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/ufortify.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/wrapperpy.cpp +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/wrapperpy.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/yacc_read.c +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/src/yacc_read.h +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/tests/test_no_wrapper.py +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/tests/test_wrapper.py +0 -0
- {pyfmtools-5.3.4 → pyfmtools-5.3.6}/tests/test_wrapper0.py +0 -0
|
@@ -10,7 +10,7 @@ with open("README.md", "r") as fh:
|
|
|
10
10
|
|
|
11
11
|
setup(
|
|
12
12
|
name="pyfmtools",
|
|
13
|
-
version="5.3.
|
|
13
|
+
version="5.3.6",
|
|
14
14
|
description="Library for handling and fitting fuzzy measures",
|
|
15
15
|
long_description=open('README.md').read(),
|
|
16
16
|
long_description_content_type="text/markdown",
|
|
@@ -182,5 +182,5 @@ LIBDLL_API int CheckMonMob2additive2(double* Mob, int n, int length, double* te
|
|
|
182
182
|
LIBDLL_API void ConvertCoMob2Kinter(double* mu, double* Mob, int n, int_64 m, int kadd, int len, int fullmu);
|
|
183
183
|
LIBDLL_API double ChoquetCoMobKInter(double* x, double* Mob, int n, int_64 m, int kadd, int length);
|
|
184
184
|
|
|
185
|
-
LIBDLL_API int generate_fm_minimals(int_64 num, int n, int ratio, int markov, double* vv);
|
|
186
|
-
LIBDLL_API int generate_fm_minimals_le(int_64 num, int n, int ratio, int markov, int_64* vv);
|
|
185
|
+
LIBDLL_API int generate_fm_minimals(int_64 num, int n, int ratio, int markov, double* weights, double* vv);
|
|
186
|
+
LIBDLL_API int generate_fm_minimals_le(int_64 num, int n, int ratio, int markov, double* weights, int_64* vv);
|
|
@@ -2095,7 +2095,7 @@ void Minimals_fast(int_64 num, int n, int_64 m, int_64* LE, double* weights)
|
|
|
2095
2095
|
|
|
2096
2096
|
}
|
|
2097
2097
|
|
|
2098
|
-
void Minimals_fastreshuffle(int_64 num, int n, int_64 m, int markov, int_64* LE,
|
|
2098
|
+
void Minimals_fastreshuffle(int_64 num, int n, int_64 m, int markov, int_64* LE, double* weights)
|
|
2099
2099
|
{
|
|
2100
2100
|
Minimals_fast(num, n, m, LE, weights);
|
|
2101
2101
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|