pyfmtools 5.3.3__tar.gz → 5.3.5__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.3/src/pyfmtools.egg-info → pyfmtools-5.3.5}/PKG-INFO +1 -1
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/setup.py +1 -1
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/buildPyfmtools.py +2 -2
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/fmrandomsort.inc +1 -1
- {pyfmtools-5.3.3 → pyfmtools-5.3.5/src/pyfmtools.egg-info}/PKG-INFO +1 -1
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/LICENSE.txt +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/MANIFEST.in +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/README.md +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/setup.cfg +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/binarylattice.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/colamd.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/colamd.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/commonlib.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/commonlib.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/declare.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/fmrandom.cpp +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/fmrandom.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/fortify.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/fuzzymeasurefit.cpp +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/fuzzymeasurefit.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/fuzzymeasurefit3.cpp +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/fuzzymeasuretools.cpp +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/fuzzymeasuretools.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/gbrealloc.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/generaldefs.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/hbio.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/ini.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/ini.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/isfixedvar.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_BFP.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_BFP1.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_BFP2.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_Hash.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_Hash.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_LUSOL.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_LUSOL.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_MDO.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_MDO.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_MPS.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_MPS.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_SOS.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_SOS.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_crash.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_crash.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_etaPFI.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_explicit.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_fortify.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_lib.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_lib.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_matrix.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_matrix.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_mipbb.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_mipbb.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_params.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_presolve.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_presolve.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_price.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_price.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_pricePSE.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_pricePSE.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_report.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_report.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_rlp.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_scale.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_scale.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_simplex.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_simplex.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_types.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_utils.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_utils.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_wlp.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lp_wlp.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lpkit.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lpslink56.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lpsolve.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lusol.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lusol.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lusol1.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lusol2.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lusol6a.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lusol6l0.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lusol6u.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lusol7a.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lusol8a.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lusolio.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/lusolio.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/minimalsplus.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/mmio.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/mmio.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/myblas.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/myblas.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/pyfmtools.egg-info/SOURCES.txt +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/pyfmtools.egg-info/dependency_links.txt +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/pyfmtools.egg-info/requires.txt +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/pyfmtools.egg-info/top_level.txt +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/pyfmtools.py +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/sparselib.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/sparselib.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/stdafx.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/ufortify.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/wrapperpy.cpp +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/wrapperpy.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/yacc_read.c +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/src/yacc_read.h +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/tests/test_no_wrapper.py +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/tests/test_wrapper.py +0 -0
- {pyfmtools-5.3.3 → pyfmtools-5.3.5}/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.5",
|
|
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",
|
|
@@ -147,8 +147,8 @@ ffibuilder.cdef(r"""
|
|
|
147
147
|
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);
|
|
148
148
|
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);
|
|
149
149
|
int py_generate_fm_2additive_randomwalk2(int num, int n, int markov, int option, double step, double * vv, void* extrachecks);
|
|
150
|
-
int py_generate_fm_minimals_le(int num, int n, int markov, double ratio, int_64* vv, struct fm_env* env);
|
|
151
|
-
int py_generate_fm_minimals(int num, int n, int markov, double ratio, double* vv, struct fm_env* env);
|
|
150
|
+
int py_generate_fm_minimals_le(int num, int n, int markov, double ratio, double* weights, int_64* vv, struct fm_env* env);
|
|
151
|
+
int py_generate_fm_minimals(int num, int n, int markov, double ratio, double* weights, double* vv, struct fm_env* env);
|
|
152
152
|
""", override=True)
|
|
153
153
|
|
|
154
154
|
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',
|
|
@@ -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
|