@@ -1,8 +1,8 @@

 Package: OncoSimulR

 Type: Package

 Title: Forward Genetic Simulation of Cancer Progression with Epistasis 

-Version: 3.99.6

-Date: 2022-09-12

+Version: 3.99.7

+Date: 2022-09-13

 Authors@R: c(

 	      person("Ramon", "Diaz-Uriarte", role = c("aut", "cre"),	

  	   		     email = "rdiaz02@gmail.com"),

@@ -1,3 +1,7 @@

+Changes in version 3.99.7 (2022-09-13):

+	- Use c++14 and, in windows, do not use -O3: try to minimize

+	  build time.

+	  

 Changes in version 3.99.6 (2022-09-12):

 	- Udpated exprtk.

@@ -4,7 +4,11 @@ CXX=g++$(VER)

 CXX11=g++$(VER)

 ## This is a C++11 package

-CXX_STD = CXX11

+## But using C++14 leads to faster INSTALL. In my machine:

+## C++11: 6'30"

+## C++14: 4'20"

+## C++17: 5'08"

+CXX_STD = CXX14

 # This ain't needed

 # ONCOSIMUL_SRC = BNB_nr.cpp\

@@ -3,7 +3,7 @@ CC=gcc$(VER)

 CXX=g++$(VER)

 CXX11=g++$(VER)

-CXX_STD = CXX11

+CXX_STD = CXX14

 ## PKG_CXXFLAGS += -I../inst/miscell

 ## We have issues under Windoze because of ExprTk, MINGW, etc.

@@ -12,14 +12,22 @@ CXX_STD = CXX11

 ## as suggested by K. D. Hansen

 ## on bioc-devel list on 2019-05-24

-MYCXXFLAGS = -Wa,-mbig-obj -O3

+## zz1

+MYCXXFLAGS = -Wa,-mbig-obj

+## MYCXXFLAGS = -Wa,-mbig-obj -O3

 ## MYCXXFLAGS = -O0

+## zz1

 %.o: %.cpp

 	$(CXX) $(ALL_CPPFLAGS) $(ALL_CXXFLAGS) $(MYCXXFLAGS) -c $< -o $@

+# %.o: %.cpp

+# 	$(CXX) $(ALL_CPPFLAGS) $(ALL_CXXFLAGS) -c $< -o $@

+

+

 ## Just in case, pass to the linker too. No effect?. See below.

-PKG_LIBS = -Wa,-mbig-obj -O3

+## z1

+## PKG_LIBS = -Wa,-mbig-obj -O3

 ## PKG_LIBS = -O3

 #####################  MAGELLAN   ####################

@@ -82,6 +90,22 @@ fl_generate: FitnessLandscape/main_fl_generate.c  $(MAGELLAN_LIBS)

 #########################################################

 #########################################################

+## Open the msys2 shell and do (change path to R)

+## export PATH=/x86_64-w64-mingw32.static.posix/bin:$PATH

+

+## Install

+## time /c/R/R-4.2.1/bin/R.exe CMD INSTALL OncoSimulR

+

+

+## Build

+## time /c/R/R-4.2.1/bin/R.exe CMD build -keep-empty-dirs --no-resave-data OncoSimulR

+

+## Check

+## time /c/R/R-4.2.1/bin/R.exe CMD check --no-multiarch --no-vignettes --timings OncoSimulR_3.4.0.tar.gz

+

+

+## Build bin

+## time /c/R/R-4.2.1/bin/R.exe CMD INSTALL --build OncoSimulR_3.4.0.tar.gz

@@ -288,3 +312,4 @@ fl_generate: FitnessLandscape/main_fl_generate.c  $(MAGELLAN_LIBS)

 ##  /c/R/R-testing/bin/x64/R CMD build --keep-empty-dirs --no-resave-data --no-build-vignettes OncoSimulR

 ##  /c/R/R-testing/bin/x64/R CMD INSTALL --merge-multiarch --build --no-build-vignettes --no-manual OncoSimulR_xyz0.tar.gz

+

@@ -1,15 +1,15 @@

 \usepackage[%

-		shash={c10b9f3},

-		lhash={c10b9f3c8917ffe4d9de26a5b91a09855bbddba3},

+		shash={ba4087e},

+		lhash={ba4087ece38225431d51d7379f18937c3802e8ac},

 		authname={ramon diaz-uriarte (at Phelsuma)},

 		authemail={rdiaz02@gmail.com},

-		authsdate={2022-07-06},

-		authidate={2022-07-06 10:42:14 +0200},

-		authudate={1657096934},

+		authsdate={2022-07-19},

+		authidate={2022-07-19 14:45:26 +0200},

+		authudate={1658234726},

 		commname={ramon diaz-uriarte (at Phelsuma)},

 		commemail={rdiaz02@gmail.com},

-		commsdate={2022-07-06},

-		commidate={2022-07-06 10:42:14 +0200},

-		commudate={1657096934},

+		commsdate={2022-07-19},

+		commidate={2022-07-19 14:45:26 +0200},

+		commudate={1658234726},

 		refnames={ (HEAD -> master, origin/master, origin/HEAD)}

 	]{gitsetinfo}

\ No newline at end of file