pyfmtools 5.2.1__tar.gz → 5.3.1__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.
Files changed (108) hide show
  1. {pyfmtools-5.2.1/src/pyfmtools.egg-info → pyfmtools-5.3.1}/PKG-INFO +1 -1
  2. pyfmtools-5.3.1/dist/pyfmtools-5.3.1.tar.gz +0 -0
  3. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/setup.py +1 -1
  4. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/buildPyfmtools.py +2 -0
  5. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/fmrandom.h +3 -0
  6. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/fmrandomsort.inc +489 -273
  7. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/fuzzymeasuretools.h +2 -2
  8. {pyfmtools-5.2.1 → pyfmtools-5.3.1/src/pyfmtools.egg-info}/PKG-INFO +1 -1
  9. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/pyfmtools.egg-info/SOURCES.txt +3 -1
  10. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/pyfmtools.py +27 -0
  11. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/wrapperpy.cpp +40 -0
  12. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/wrapperpy.h +4 -0
  13. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/tests/test_wrapper.py +32 -1
  14. pyfmtools-5.3.1/tests/test_wrapper0.py +32 -0
  15. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/LICENSE.txt +0 -0
  16. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/MANIFEST.in +0 -0
  17. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/README.md +0 -0
  18. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/setup.cfg +0 -0
  19. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/binarylattice.h +0 -0
  20. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/colamd.c +0 -0
  21. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/colamd.h +0 -0
  22. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/commonlib.c +0 -0
  23. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/commonlib.h +0 -0
  24. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/declare.h +0 -0
  25. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/fmrandom.cpp +0 -0
  26. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/fortify.h +0 -0
  27. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/fuzzymeasurefit.cpp +0 -0
  28. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/fuzzymeasurefit.h +0 -0
  29. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/fuzzymeasurefit3.cpp +0 -0
  30. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/fuzzymeasuretools.cpp +0 -0
  31. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/gbrealloc.c +0 -0
  32. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/generaldefs.h +0 -0
  33. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/hbio.h +0 -0
  34. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/ini.c +0 -0
  35. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/ini.h +0 -0
  36. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/isfixedvar.c +0 -0
  37. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_BFP.h +0 -0
  38. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_BFP1.h +0 -0
  39. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_BFP2.h +0 -0
  40. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_Hash.c +0 -0
  41. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_Hash.h +0 -0
  42. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_LUSOL.c +0 -0
  43. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_LUSOL.h +0 -0
  44. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_MDO.c +0 -0
  45. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_MDO.h +0 -0
  46. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_MPS.c +0 -0
  47. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_MPS.h +0 -0
  48. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_SOS.c +0 -0
  49. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_SOS.h +0 -0
  50. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_crash.c +0 -0
  51. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_crash.h +0 -0
  52. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_etaPFI.h +0 -0
  53. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_explicit.h +0 -0
  54. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_fortify.h +0 -0
  55. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_lib.c +0 -0
  56. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_lib.h +0 -0
  57. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_matrix.c +0 -0
  58. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_matrix.h +0 -0
  59. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_mipbb.c +0 -0
  60. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_mipbb.h +0 -0
  61. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_params.c +0 -0
  62. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_presolve.c +0 -0
  63. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_presolve.h +0 -0
  64. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_price.c +0 -0
  65. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_price.h +0 -0
  66. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_pricePSE.c +0 -0
  67. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_pricePSE.h +0 -0
  68. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_report.c +0 -0
  69. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_report.h +0 -0
  70. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_rlp.h +0 -0
  71. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_scale.c +0 -0
  72. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_scale.h +0 -0
  73. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_simplex.c +0 -0
  74. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_simplex.h +0 -0
  75. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_types.h +0 -0
  76. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_utils.c +0 -0
  77. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_utils.h +0 -0
  78. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_wlp.c +0 -0
  79. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lp_wlp.h +0 -0
  80. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lpkit.h +0 -0
  81. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lpslink56.c +0 -0
  82. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lpsolve.h +0 -0
  83. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lusol.c +0 -0
  84. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lusol.h +0 -0
  85. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lusol1.h +0 -0
  86. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lusol2.h +0 -0
  87. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lusol6a.h +0 -0
  88. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lusol6l0.h +0 -0
  89. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lusol6u.h +0 -0
  90. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lusol7a.h +0 -0
  91. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lusol8a.h +0 -0
  92. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lusolio.c +0 -0
  93. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/lusolio.h +0 -0
  94. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/minimalsplus.h +0 -0
  95. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/mmio.c +0 -0
  96. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/mmio.h +0 -0
  97. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/myblas.c +0 -0
  98. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/myblas.h +0 -0
  99. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/pyfmtools.egg-info/dependency_links.txt +0 -0
  100. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/pyfmtools.egg-info/requires.txt +0 -0
  101. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/pyfmtools.egg-info/top_level.txt +0 -0
  102. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/sparselib.c +0 -0
  103. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/sparselib.h +0 -0
  104. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/stdafx.h +0 -0
  105. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/ufortify.h +0 -0
  106. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/yacc_read.c +0 -0
  107. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/yacc_read.h +0 -0
  108. {pyfmtools-5.2.1 → pyfmtools-5.3.1}/tests/test_no_wrapper.py +0 -0
{pyfmtools-5.2.1/src/pyfmtools.egg-info → pyfmtools-5.3.1}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: pyfmtools
3
- Version: 5.2.1
3
+ Version: 5.3.1
4
4
  Summary: Library for handling and fitting fuzzy measures
5
5
  Home-page:
6
6
  Author: Gleb Beliakov, Norbert Henseler
{pyfmtools-5.2.1 → pyfmtools-5.3.1}/setup.py RENAMED
@@ -10,7 +10,7 @@ with open("README.md", "r") as fh:
10
10
 
11
11
  setup(
12
12
  name="pyfmtools",
13
- version="5.2.1",
13
+ version="5.3.1",
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",
{pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/buildPyfmtools.py RENAMED
@@ -147,6 +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
152
  """, override=True)
151
153
 
152
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',
{pyfmtools-5.2.1 → pyfmtools-5.3.1}/src/fmrandom.h RENAMED
@@ -181,3 +181,6 @@ LIBDLL_API int CheckMonMob2additive2(double* Mob, int n, int length, double* te
181
181
 
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
+
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);