Merge pull request #44 from TolisChal/fix_cran

remove unused flags from makevars, fix error in lp_MPS.c, set version…

Author: vissarion

R-proj/DESCRIPTION

@@ -14,8 +14,8 @@ Description: Provides an R interface for 'volesti' C++ package. 'volesti' comput
              rounding and rotating polytopes. Moreover, 'volesti' provides algorithms for 
              estimating copulas (L. Cales, A. Chalkis, I.Z. Emiris, V. Fisikopoulos (2018) 
              <arXiv:1803.05861>).
-Version: 1.0.2
-Date: 2019-05-10
+Version: 1.0.3
+Date: 2019-09-10
 Maintainer: Vissarion Fisikopoulos <[email protected]>
 Depends: Rcpp (>= 0.12.17)
 Imports: methods

R-proj/src/Rproj_externals/lp_solve/lp_MPS.c

@@ -1259,7 +1259,8 @@ static void number(char *str,LPSREAL value)
       *(--_str)=' ';
      }
     }
-  strncpy(str,_str,12);
+  //strncpy(str,_str,12);
+  _str[12] ='\0'; strcpy(str, _str);
  }
 
 static char *formatnumber12(char *numberbuffer, double a)

cran_gen/Makevars

@@ -1,5 +1,5 @@
 PKG_CPPFLAGS=-Iexternal/lpsolve/headers/run_headers -Iexternal/minimum_ellipsoid -Iinclude -Iinclude/volume -Iinclude/generators -Iinclude/samplers -Iinclude/annealing -Iinclude/convex_bodies
-PKG_CXXFLAGS= -lm -ldl -DBOOST_NO_AUTO_PTR
+PKG_CXXFLAGS= -DBOOST_NO_AUTO_PTR
 CXX_STD = CXX11
 
 PKG_LIBS=-Lexternal/lpsolve/build/lp_solve -llp_solve $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)

cran_gen/NEWS.md

@@ -10,4 +10,6 @@
 
 * Remove r-striper to avoid CRAN policy violation.
 
+# volesti 1.0.3
 
+* Fix CRAN warnings.

external/LPsolve_src/include/lpkit.h

@@ -38,4 +38,4 @@
 #define FREE(ptr) if (ptr != NULL) {free(ptr), ptr = NULL;} else
 
 #define MALLOCCPY(nptr, optr, nr, type)\
-  (MALLOC(nptr, nr, type), (nptr != NULL) ? memcpy(nptr, optr, (size_t)((nr) * sizeof(*optr))) : 0, nptr)
+  (MALLOC(nptr, nr, type), (nptr != NULL) ? memcpy(nptr, optr, (size_t)((nr) * sizeof(*optr))) : 0)

test/volumeCV_test.cpp

@@ -49,7 +49,7 @@ void test_CV_volume(Polytope &HP, NT expected, NT tolerance=0.3)
     // Estimate the volume
     std::cout << "Number type: " << typeid(NT).name() << std::endl;
     NT vol = 0;
-    unsigned int const num_of_exp = 15;
+    unsigned int const num_of_exp = 20;
     for (unsigned int i=0; i<num_of_exp; i++)
     {
         CheBall = HP.ComputeInnerBall();
@@ -166,11 +166,11 @@ void call_test_simplex() {
 
     std::cout << "--- Testing volume of H-simplex10" << std::endl;
     P = gen_simplex<Hpolytope>(10, false);
-    test_CV_volume<NT, RNGType>(P, 1.0 / factorial(10.0));
+    test_CV_volume<NT, RNGType>(P, 1.0 / factorial(10.0), 0.2);
 
     std::cout << "--- Testing volume of H-simplex20" << std::endl;
     P = gen_simplex<Hpolytope>(20, false);
-    test_CV_volume<NT, RNGType>(P, 1.0 / factorial(20.0));
+    test_CV_volume<NT, RNGType>(P, 1.0 / factorial(20.0), 0.2);
 
     std::cout << "--- Testing volume of H-simplex30" << std::endl;
     P = gen_simplex<Hpolytope>(30, false);