--- imach/src/Makefile	2015/09/30 17:43:12	1.71
+++ imach/src/Makefile	2022/08/31 10:29:08	1.90
@@ -1,10 +1,13 @@
 #Version has to be set in ../CMakeLists.txt too.
-VERSION=0.98r0
+#VERSION=0.98r6
+#VERSION=$(shell echo `grep IMACH_VERSION__ version.h | echo 'titi'`)
+VERSION=$(shell echo `grep IMACH_VERSION__ version.h | awk 'BEGIN { FS = "[ \t\n\"]+" }  { print $$3 }'`)
+OSTYPE = $(shell echo $$OSTYPE)
 # DRIVEG is for VirtualBox Windows 64bit 
 DRIVEG=f:
 #DIRG is the corresponding build directory for Virtual Windows
 DIRG=\imach\cvs\imach\build
-COPYRIGHT=Copyright (C)  2002-2015 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2015
+COPYRIGHT=Copyright (C)  2002-2022 INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2016-19
 IMACHSETUPVERSION=icl
 # This is for Windows only
 #IMACHSETUPVERSION=mvc
@@ -12,7 +15,8 @@ IMACHSETUPVERSION=icl
 #       Linux
 # make _linux=1 imachopt
 # make _linux=1 imach
-# cpack -D CPACK_RPM_PACKAGE_DEBUG=1 -D CPACK_RPM_SPEC_INSTALL_POST="/bin/true" -G RPM
+# make _linux=1 imachrpm
+# cd to build/gnulinux ; cmake ../..; cpack -D CPACK_RPM_PACKAGE_DEBUG=1 -D CPACK_RPM_SPEC_INSTALL_POST="/bin/true" -G RPM
 # make _linux32onosx=1 imachopt
 # make _linux64onosx=1 imachopt
 
@@ -25,8 +29,23 @@ IMACHSETUPVERSION=icl
 # make _macosx=1 imachopt
 #  valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ~/Documents/imachcvs/imach/src/imach-1.129cvsmac radlc-1.129.imach
 
-#        Windows
+#        Windows should be started on VirtualBox and both 32 and 64 commands should be made
+# xlcem is year month delay, doing the command make on the username and not on root
+# on emacs shell:
+# sudo xlcem make _windowsonosx=1 imachICL64-setup
+# ls -l ../build/icl64/Release/
+# sudo xlcem make _windowsonosx=1 imachICL32-setup
+# ls -l ../build/icl32/Release/
+# and then F: should be mounted on ~/Documents
+# For an unknown reason, the exe file on /Documents/imach/cvs/imach/build/icl64/Release~or icl32 are not recognized by make which deletes
+# previous work and imachICL-set
+# has to be done manually:  SETUPCOMP=~/bin/InnoSetup5Playonmac
+# and $SETUPCOMP  /cc setup.iss
+# or on Emacs make _windowsonosx=1 imachICL-set (and not imachICL-setup)
+#  sudo date -u 082109552022 
 # make _windowsonosx=1 imachICL-setup (touch setup.iss.in) #binary should have been compiled on Windows with Intel
+# make _windowsonosx=1 imachICL64-setup (touch setup.iss.in) #binary should have been compiled on Windows with Intel
+# make _windowsonosx=1 imachICL32-setup (touch setup.iss.in) #binary should have been compiled on Windows with Intel
 # make _windowsonosx=1 imachMVC-setup (touch setup.iss.in) #binary should have been compiled on Windows with cl
 # make _windowsonosx=1 imachMVC-noreg-setup
 #
@@ -52,20 +71,44 @@ IMACHSETUPVERSION=icl
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/rbiaspar-098p.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/Aaron/brouard/results/COVARAITE_94/rmypar24pis1cov1-age.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/Flavia/rADL0w_V1V2b.imach
-TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/rrtest3b.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/rrtest3b.imach
+#TESTFILE=$(HOME)//Documents/Recherches/REVES/Flavia/Flavia-nov-2015/rtest3c.imach
+#TESTFILE=/mnt/tugault/Documents/Recherches/REVES/Yao/rhrs-yao-test-back.imach
+#TESTFILE=/mnt/tugault/Documents/Recherches/REVES/Flavia/Flavia-nov-2015/rtest3bb.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/Flavia/Flavia-nov-2015/rtest3bb.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/saito-12-feb-2016/rHRS_relig_import_M_NB.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/Biaspar/biaspar-0.98r-powellf1f3linmnb-zeroes.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/Yao-19-jan-2016/r2V4V3V5.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/Yao-19-jan-2016/r2b4V4V3V5.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/Yao-19-jan-2016/Vn1b.imach
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Saito-PAA-2018/rrLvngArrgJapan-two-1b.imach
+#TESTFILE=$(HOME)/Documents/Recherches/HRS/RAND_HRS/imachb.imach
+#TESTFILE=$(HOME)/Documents/Recherches/HRS/RAND_HRS/imachb-r18.imach
+TESTFILE=$(HOME)/Documents/Recherches/REVES/Zachary/Zach-2022/Feinuo_Sun/feinuo-pb2022/para3_testNB.imach
+#TESTFILE=$(HOME)/home/brouard/Documents/Recherches/REVES/Zachary/Zach-2022/Feinuo_Sun/feinuo-pb2022/rrrpara3_testNB30b.imach
+# Two testfiles which should give similar results with V1=1 whatever V2 and V3.
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/Zachary/Zach-2022/Feinuo_Sun/feinuo-pb2022/female_sample/para_femaleNBV2V3sexW0-ter.imach
+TESTFILE=$(HOME)/Documents/Recherches/REVES/Zachary/Zach-2022/Feinuo_Sun/feinuo-pb2022/rrpara3_testNB30sexW0-ter.htm
+#TESTFILE=$(HOME)/Documents/Recherches/REVES/Yao/Yao-19-jan-2016/rrrV4V3V5-suite6.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc-test-mac/adecode-1.142c.imach
 #TESTFILE=$(HOME)/Documents/Recherches/REVES/SAITO/Tokyo2014/adlc_test_magei4/radlc_often.imach
 #CC= gcc -v
 CC=$(GCC)
+CCOPT=$(GCCOPT)
 GCC= gcc
+GCCOPT= gcc
 
 ifdef _macosx
+GCC= gcc-11
+GCCOPT= gcc
 # Mac OS/X version
 LFLAGS= -g -lm 
 #CFLAGS= -g -DDEBUG 
 CFLAGS= -g 
-LFLAGSOPT= -O3 -lm 
+LFLAGSOPT= -O3 -lm
 CFLAGSOPT= -O3 
+# LFLAGSOPT= -O2 -lm  # seems to be less effective than O3
+# CFLAGSOPT= -O2 
 CP= cp
 CROSSCOMPILATION= -DCROSS=0
 UNIX2DOS= echo "Unix2dos " 
@@ -245,7 +288,7 @@ TMPSCRIPTIN=setup.iss.in
 APPLICATION=IMaCh
 APPNAME=$(APPLICATION)-$(VERSION)
 APPCOMPILATIONMODE=$(IMACHSETUPVERSION)
-GNUPLOTVERSION=4.6
+GNUPLOTVERSION=5.1
 LICENSE=Copying
 TMPSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-setup.exe
 TMPNOREGSETUPEXE=imach-$(VERSION)-$(IMACHSETUPVERSION)-noreg-setup.exe
@@ -312,9 +355,13 @@ imachICL-build: imach.c
 #/GS /W3 /Gy /Zc:wchar_t /Zi /O2 /Fd"x64\Release\vc120.pdb" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_LIB" /D "_UNICODE" /D "UNICODE" /Qipo /Zc:forScope /Oi /MT /Fa"x64\Release\" /EHsc /nologo /Fo"x64\Release\" /Qprof-dir "x64\Release\" /Fp"x64\Release\IMaCh-icl-x64-0.98q2.pch"
 #  /Users/nbrouard/Documents/imach/imach-gui/build/icl64/Release/imach.exe
 # both 32 and 64 executables should have been built on Windows with Intel compiler.
-imachICL-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss ../distributions/windows/mybuildicl64.bat ../distributions/windows/mybuildicl32.bat 
+
+imachICL-set: ../build/icl64/Release/imach-$(VERSION).exe ../build/icl32/Release/imach-$(VERSION).exe setup.iss  setup.iss 
 	pwd
 	touch setup.iss.in
+	echo SETUPCOMP=$(SETUPCOMP)
+	echo STRIP= $(STRIP)
+	echo BINVERSION= $(BINVERSION)
 	$(SETUPCOMP) /cc setup.iss
 	$(CP) Output/$(TMPSETUPEXE) imachICL-setup
 
@@ -333,22 +380,37 @@ imachICL64-noreg-setup: IMaCh-icl64-$(VE
 	rm -rf ../build/icl64  && mkdir ../build/icl64
 	cp ../distributions/windows/mybuildicl64.bat ../build/icl64/
 	cd ../build/icl64
-	VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \
-	--username brouard  --verbose --wait-exit --wait-stdout  --wait-stderr -- "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
+	VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\System32\cmd.exe" \
+ --username brouard  --verbose --wait-stdout  --wait-stderr -- "C:\Windows\SysWOW64\cmd.exe" "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
+
+#       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "c:\\windows\\system32\\ipconfig.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/all"
+#       VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "DIR"
+
+#	VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "DIR" 
+#	VBoxManage --nologo guestcontrol "Windows7-64" run --exe "c:\\windows\\system32\\ipconfig.exe" --username brouard  --verbose  --wait-stdout  --wait-stderr -- "/all"
+#VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
+#	--username brouard  --verbose  --wait-stdout  --wait-stderr -- "/c" "$(DRIVEG)$(DIRG)\icl64\mybuildicl64.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
 
 ../build/icl32/Release/IMaCh-$(VERSION).exe: imach.c ../distributions/windows/mybuildicl32.bat
 	rm -rf ../build/icl32 && mkdir -p ../build/icl32
 	cp ../distributions/windows/mybuildicl32.bat ../build/icl32/
 	cd ../build/icl32
-	VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \
-	--username brouard  --verbose --wait-exit --wait-stdout -- "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
+	VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\System32\cmd.exe" \
+  --username brouard  --verbose --wait-stdout -- "C:\Windows\SysWOW64\cmd.exe" "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
+#	VBoxManage startvm "Windows7-64" --type headless
+#	VBoxManage list runningvms
+# 	sudo xlcem VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\System32\cmd.exe" \
+# --username brouard  --verbose --wait-stdout -- "C:\Windows\SysWOW64\cmd.exe" "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
+
+#VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\SysWOW64\cmd.exe" \
+# --username brouard  --verbose  --wait-stdout -- "/c" "$(DRIVEG)$(DIRG)\icl32\mybuildicl32.bat" "$(VERSION)" "$(DRIVEG)" "$(DIRG)"
 
 ../build/vs32/Release/IMaCh-$(VERSION).exe: imach.c mybuildvs32.bat
 	rm -rf ../build/vs32 && mkdir -p ../build/vs32
 	cp mybuildvs32.bat ../build/vs32/
 	cd ../build/vs32
-	VBoxManage --nologo guestcontrol "Windows7-64" execute --image "C:\Windows\SysWOW64\cmd.exe" \
-	--username brouard  --verbose --wait-exit --wait-stdout -- "/c" "g:\imach\imach-gui\build\vs32\mybuildvs32.bat" "$(VERSION)"
+	VBoxManage --nologo guestcontrol "Windows7-64" run --exe "C:\Windows\System32\cmd.exe" \
+	--username brouard  --verbose  --wait-stdout --  "C:\Windows\SysWOW64\cmd.exe" "/c" "g:\imach\imach-gui\build\vs32\mybuildvs32.bat" "$(VERSION)"
 # C:\Windows\SysWOW64\cmd.exe /E:ON /V:ON /K "g:\imach\imach-gui\build\icl32\mybuild.bat"
 #WORK	--username brouard  --verbose --wait-exit --wait-stdout -- "/c" "c:\users\brouard\mybuild.bat"
 #	--username brouard  --verbose --wait-exit --wait-stdout -- "/c" "g: && cd \imach\imach-gui\build\icl32 && mybuild.bat"
@@ -360,7 +422,7 @@ imachICL64-noreg-setup: IMaCh-icl64-$(VE
 
 imachICL64-setup: ../build/icl64/Release/IMaCh-$(VERSION).exe setup.iss mybuildicl64.bat
 
-imachICL32-setup: ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss mybuildicl32.bat
+imachICL32-setup: ../build/icl32/Release/IMaCh-$(VERSION).exe setup.iss ../distributions/windows/mybuildicl32.bat
 
 imachVS32-setup: ../build/vs32/Release/IMaCh-$(VERSION).exe setup.iss mybuildvs32.bat
 
@@ -395,17 +457,160 @@ ifdef _macosx
 endif
 
 imach: imach.o 
-	$(CC) $(LFLAGS) -o imach imach.o
+	$(CC)  -o imach $(LFLAGS) imach.o
 ifdef _macosx
 	$(DSYMUTIL) imach
 endif
 
 imach.o : imach.c 
-	 $(CC) $(CFLAGS) $(CROSSCOMPILATION)  -c imach.c
+	 $(CC) $(CFLAGS) $(CROSSCOMPILATION)  -c $<
+#	 $(CC) $(CFLAGS) $(CROSSCOMPILATION)  -DDEBUGMEM -c $<
 #	 $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DDEBUGBRENT -c imach.c
 
+imach-0.98r: imach-0.98r.o 
+	$(CC) $(LFLAGS) -o $@ $<
+ifdef _macosx
+	$(DSYMUTIL) $@
+endif
+
+# Horrible no f3<f1 test and direct test,  converges if close to maximum otherwise diverges
+#calls = 13 & 1760, -2 Log likelihood = 46537.411806825585
+imach-0.98r.o : imach-0.98r.c 
+	 $(CC) $(CFLAGS) -DPOWELLNOF3INFF1TEST -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION)  -c $<
+
+#################
+imach-0.98r-powellsf1f3: imach-0.98r-powellsf1f3.o 
+	$(CC) $(LFLAGS) -o $@ $<
+ifdef _macosx
+	$(DSYMUTIL) $@
+endif
+
+# test f3<f1 but direct test and no powell criteria which are NOPOWELLORIGINALNOMNBAKORIGINAL NOLINMINORIGINAL
+# diverges now from zeroes calls = 18 & 3163, -2 Log likelihood = 50929.075310962719
+# but converges if close to the maximum
+# calls = 13 & 1760, -2 Log likelihood = 46537.411806825585
+imach-0.98r-powellsf1f3.o : imach-0.98r.c 
+	 $(CC) $(CFLAGS)  -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE  $(CROSSCOMPILATION) -o $@  -c $<
+#	 $(CC) $(CFLAGS)  -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE  $(CROSSCOMPILATION) -E -c $< | cppbeauty
+
+######
+imach-0.98r-powellf1f3: imach-0.98r-powellf1f3.o 
+	$(CC) $(LFLAGS) -o $@ $<
+ifdef _macosx
+	$(DSYMUTIL) $@
+endif
+
+#Powell original but with mnbrak fix  -DUNKNOWNSTATUSNOTCONTRIBUTING -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE
+#diverges from zeroes
+# calls = 13 & 1760, -2 Log likelihood = 46537.411806825585 Real minumum
+imach-0.98r-powellf1f3.o : imach-0.98r.c 
+	 $(CC) $(CFLAGS) -DPOWELLORIGINAL -DLINMINORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -o $@  -c $<
+imach-0.98r-powellf1f3.i : imach-0.98r.c 
+	 $(CC) $(CFLAGS) -DPOWELLORIGINAL -DLINMINORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -E   -c $<| cppbeauty
+#	 $(CC) $(CFLAGS) -DPOWELLORIGINAL -DLINMINORIGINAL  $(CROSSCOMPILATION) -E -o $@  -c $<
+
+######################
+imach-0.98r-powell: imach-0.98r-powell.o 
+	$(CC) $(LFLAGS) -o $@ $<
+ifdef _macosx
+	$(DSYMUTIL) $@
+endif
+
+# Powell original means without -DPOWELLNOF3INFF1TEST (with F3<F1 test) 
+#calls = 33 & 4088, -2 Log likelihood = 46623.239341985027 reaches the maximum !
+#From zeroes doesn't reach the maximum calls = 34 & 4212, -2 Log likelihood = 46542.398769900567
+#calls = 34 & 4212, -2 Log likelihood = 46542.398769900567
+imach-0.98r-powell.o : imach-0.98r.c 
+	 $(CC) $(CFLAGS) -DPOWELLORIGINAL -DLINMINORIGINAL -DMNBRAKORIGINAL  -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -o $@  -c $<
+#	 $(CC) $(CFLAGS) -DPOWELLORIGINAL -DLINMINORIGINAL -DMNBRAKORIGINAL $(CROSSCOMPILATION) -E  -c $< | cppbeauty
+
+imach-0.98r-powell.i : imach-0.98r.c 
+	 $(CC) $(CFLAGS) -DPOWELLORIGINAL -DLINMINORIGINAL -DMNBRAKORIGINAL $(CROSSCOMPILATION) -E -o $@ -c $< 
+
+###############
+# powell test with f1f3 powell, linmin fix but no mnbrak fix
+imach-0.98r-powellf1f3lin: imach-0.98r-powellf1f3lin.o 
+	$(CC) $(LFLAGS) -o $@ $<
+ifdef _macosx
+	$(DSYMUTIL) $@
+endif
+
+# ?calls = 41 & 4718, -2 Log likelihood = 46690.242656475864
+#calls = 33 & 4088, -2 Log likelihood = 46623.239341985027
+# from zeroes calls = 34 & 4212, -2 Log likelihood = 46542.398769900567
+imach-0.98r-powellf1f3lin.o : imach-0.98r.c 
+	 $(CC) $(CFLAGS) -DPOWELLORIGINAL -DMNBRAKORIGINAL  -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -o $@  -c $<
+
+#############
+
+
+# directest with f3<f1 without mnbrak fix but linmin fix
+imach-0.98r-powellf1f3orilin: imach-0.98r-powellf1f3orilin.o 
+	$(CC) $(LFLAGS) -o $@ $<
+ifdef _macosx
+	$(DSYMUTIL) $@
+endif
+
+#Maximum not reached but converge from zeroes
+#calls = 34 & 4212, -2 Log likelihood = 46542.398769900567
+imach-0.98r-powellf1f3orilin.o : imach-0.98r.c 
+	 $(CC) $(CFLAGS)  -DMNBRAKORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -o $@  -c $<
+
+#######
+
+# Powell test not direct, with mnbrak and linmin fixes
+imach-0.98r-powellf1f3linmnb: imach-0.98r-powellf1f3linmnb.o 
+	$(CC) $(LFLAGS) -o $@ $<
+ifdef _macosx
+	$(DSYMUTIL) $@
+endif
+
+# worst, diverges from zeroes -DDEBUGMNBRAK
+#calls = 18 & 3163, -2 Log likelihood = 50929.075310962719
+
+imach-0.98r-powellf1f3linmnb.o : imach-0.98r.c 
+	 $(CC) $(CFLAGS) -DDEBUG -DPOWELLORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -o $@  -c $<
+imach-0.98r-powellf1f3linmnb.i : imach-0.98r.c 
+	 $(CC) $(CFLAGS) -DDEBUG -DPOWELLORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE $(CROSSCOMPILATION) -E -c $< | cppbeauty
+#########
+
+# Powell test not direct, with mnbrak and linmin fixes
+imach-0.98r-powellf1f3linmnbiter: imach-0.98r-powellf1f3linmnbiter.o 
+	$(CC) $(LFLAGS) -o $@ $<
+ifdef _macosx
+	$(DSYMUTIL) $@
+endif
+
+#
+#
+
+imach-0.98r-powellf1f3linmnbiter.o : imach-0.98r.c 
+	 $(CC) $(CFLAGS) -DDEBUG -DPOWELLORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE -DNODIRECTIONCHANGEDUNTILNITER $(CROSSCOMPILATION) -o $@  -c $<
+imach-0.98r-powellf1f3linmnbiter.i : imach-0.98r.c 
+	 $(CC) $(CFLAGS) -DDEBUG -DPOWELLORIGINAL -DUNKNOWNSTATUSNOTCONTRIBUTING  -DDISPATCHINGKNOWNDEATHAFTERLASTWAVE -DNODIRECTIONCHANGEDUNTILNITER $(CROSSCOMPILATION) -E -c $< | cppbeauty
+#########
+
+
+imach-0.98r-powellf1f3ori: imach-0.98r-powellf1f3ori.o 
+	$(CC) $(LFLAGS) -o $@ $<
+ifdef _macosx
+	$(DSYMUTIL) $@
+endif
+
+# Powell  with -DPOWELLNOF3INFF1TEST which is not Powell original!
+#calls = 41 & 4718, -2 Log likelihood = 46690.242656475864, doesn't reach the maximum
+imach-0.98r-powellf1f3ori.o : imach-0.98r.c 
+	 $(CC) $(CFLAGS) -DPOWELLNOF3INFF1TEST -DPOWELLORIGINAL -DLINMINORIGINAL -DMNBRAKORIGINAL $(CROSSCOMPILATION) -o $@  -c $< 
+imach-0.98r-powellf1f3ori.i : imach-0.98r.c 
+	 $(CC) $(CFLAGS) -DPOWELLNOF3INFF1TEST -DPOWELLORIGINAL -DLINMINORIGINAL -DMNBRAKORIGINAL $(CROSSCOMPILATION) -E -o $@  -c $<| cppbeauty
+
+
+
+
+
+
 imachtest.o : imach.c 
-	 $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DPOWELLORIGINAL -DNRCORIGINAL -DINFINITYORIGINAL -DDEBUGBRENT -o imachtest.o -c imach.c
+	 $(CC) $(CFLAGS) $(CROSSCOMPILATION) -DPOWELLORIGINAL -DNRCORIGINAL -DINFINITYORIGINAL -DDEBUGBRENT -o $@ -c $<
 
 #	 $(CC) $(CFLAGS) $(CROSSCOMPILATION)  -DFIXMNBRAK -o imachtest.o -c imach.c
 
@@ -439,9 +644,11 @@ imachBOBYQAopt : imachBOBYQAopt.o
 imachBOBYQAopt.o : imach.c 
 	$(CC) $(CFLAGS) -DNLOPT $(INLOPT) -DBOBYQA -o imachBOBYQAopt.o -c imach.c
 
+# imachback : imachback.o
+# 	$(CC) $(LFLAGSOPT) -o imachback imachback.o
 
 imachopt : imachopt.o 
-	$(CC) $(LFLAGSOPT) -o imachopt imachopt.o
+	$(CCOPT) $(LFLAGSOPT) -o imachopt imachopt.o
 	ln -f imachopt imach
 	$(CP) imachopt Output/imachopt$(VERSION)-$(BINVERSION)
 	$(CP) -f imach ../bin
@@ -450,6 +657,7 @@ ifdef _intel64onosx
 endif
 ifdef _macosx
 	$(STRIP) imach
+	$(STRIP) imachopt
 endif
 ifdef _linux32onosx
 	(cd .. && $(TAR) jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)
@@ -458,60 +666,131 @@ ifdef _linux64onosx
 	(cd .. && $(TAR) jcvf src/Output/imach-Linux-$(VERSION)-$(BINVERSION).tar.bz2 bin html/doc/biaspar.imach html/doc/data1.txt)
 endif
 
-imachopt.o : imach.c
-	$(CC) $(CFLAGSOPT) $(CROSSCOMPILATION) -o imachopt.o -c imach.c
+imachback: imachback.o 
+	$(CC) $(LFLAGS) -DBACKCASTWO -o imachback imachback.o
+ifdef _macosx
+	$(DSYMUTIL) imachback
+endif
+
+imachback.o : imachback.c version.h
+	$(CC)  $(CFLAGS) $(CROSSCOMPILATION)  -c $<
+
+imachopt.o : imach.c version.h
+	$(CCOPT) $(CFLAGSOPT) $(CROSSCOMPILATION) -o imachopt.o -c imach.c
 #	$(CC) $(CFLAGSOPT) -DPOWELL -o imachopt.o -c imach.c
 
 imachUB : imach32 imach64
 	lipo -create -arch i386 imach_32 -arch x86_64 imach_64 -output imach$(VERSION)
 
+imachrpm : imachopt.o 
+	pwd
+	(cd ../build && rm -r gnulinux && mkdir gnulinux && cd gnulinux ;\
+	pwd ;\
+	cmake ../..;\
+	cmake --build . ; \
+	echo $(OSTYPE);\
+	cpack  --debug --verbose -D CPACK_RPM_PACKAGE_DEBUG=1 -G RPM;\
+	cp  imach-$(VERSION)-*.rpm ../../src/Output/ ;)
+
+imachsrcrpm : imachopt.o 
+	pwd
+	(cd ../build && rm -r gnulinux && mkdir gnulinux && cd gnulinux ;\
+	pwd ;\
+	cmake ../..;\
+	cmake --build . ; \
+	echo $(OSTYPE);\
+	cpack --debug --verbose -D CPACK_RPM_PACKAGE_DEBUG=1 -G RPM --config ./CPackSourceConfig.cmake;\
+	cp  imach-$(VERSION)-*.rpm ../../src/Output/ ;)
 
 #imachdmg : imachopt.o create-dmg applet IMaChInfo.plist.in IMaChPkgInfo.in IMaCh.icns main.scpt.in IMaCh-ecrandemarrage.rsrc TXT.rtf
 #	$(CC) $(LFLAGSOPT) -o imach imachopt.o
-	#hdiutil detach /Volumes/IMaCh\ $(VERSION)
-imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/createdmg3.sh ../distributions/osx/applet ../distributions/osx/IMaChInfo.plist.in ../distributions/osx/IMaChPkgInfo.in ../distributions/osx/IMaCh.icns ../distributions/osx/main.scpt.in ../distributions/osx/IMaCh-ecrandemarrage.rsrc ../distributions/osx/TXT.rtf
+#	#hdiutil detach /Volumes/IMaCh\ $(VERSION)
+#	cp ../../distributions/osx/gnuplot_bin/gnuplot_2_6_5_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
+
+imachdmg : imachopt.o ../distributions/osx/create-dmg ../distributions/osx/createdmg4.sh ../distributions/osx/IMaChInfo.plist.in ../distributions/osx/IMaChPkgInfo.in ../distributions/osx/IMaCh.icns  ../distributions/osx/TXT.rtf
 	pwd
 	(cd ../build && rm -r osx && mkdir osx && cd osx ;\
 	pwd ;\
 	cmake ../..;\
 	cmake --build . ; \
+	echo $(OSTYPE);\
+	echo $(VERSION);\
 	rm -rf imach$(VERSION).app;\
 	mkdir -p imach$(VERSION).app;\
 	mkdir -p imach$(VERSION).app/Contents;\
 	mkdir -p imach$(VERSION).app/Contents/MacOS;\
-	cp ../../distributions/osx/applet imach$(VERSION).app/Contents/MacOS;\
 	mkdir -p imach$(VERSION).app/Contents/Resources;\
 	mkdir -p imach$(VERSION).app/Contents/Resources/Scripts;\
 	mkdir -p imach$(VERSION).app/Contents/Resources/bin;\
-	mkdir -p imach$(VERSION).app/Contents/Resources/html;\
+	mkdir -p imach$(VERSION).app/Contents/Resources/lib;\
+	mkdir -p imach$(VERSION).app/Contents/Resources/doc;\
+	mkdir -p imach$(VERSION).app/Contents/Resources/tests;\
+	mkdir -p imach$(VERSION).app/Contents/Resources/tests/data;\
+	cp ../../distributions/osx/imach.sh imach$(VERSION).app/Contents/MacOS;\
 	cp IMaCh-$(VERSION) imach$(VERSION).app/Contents/Resources/bin/imach;\
-	cp ../../distributions/osx/gnuplot_bin/gnuplot_2_6_5_OSX imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
+	cp ../../distributions/osx/imach-run.sh imach$(VERSION).app/Contents/Resources/bin;\
+	cp ../../distributions/osx/gnuplot_bin/bin/gnuplot imach$(VERSION).app/Contents/Resources/bin/gnuplot;\
+	cp ../../distributions/osx/gnuplot_bin/lib/* imach$(VERSION).app/Contents/Resources/lib;\
 	mkdir -p imach$(VERSION).app/Contents/Resources/description.rtfd;\
 	cp -p ../../distributions/osx/TXT.rtf imach$(VERSION).app/Contents/Resources/description.rtfd ;\
 	$(SED) -e "s/@VERSION@/$(VERSION)/g;" ../../distributions/osx/IMaChInfo.plist.in  >imach$(VERSION).app/Contents/Info.plist ;\
 	cp -p ../../distributions/osx/IMaChPkgInfo.in  imach$(VERSION).app/Contents/PkgInfo ;\
-	cp -p ../../distributions/osx/IMaCh.icns  imach$(VERSION).app/Contents/Resources/applet.icns ;\
-	cp -r -p ../../distributions/osx/main.scpt.in imach$(VERSION).app/Contents/Resources/Scripts/main.scpt ;\
-	cp ../../distributions/osx/IMaCH-ecrandemarrage.rsrc imach$(VERSION).app/Contents/Resources/applet.rsrc ;\
-	cp ../../html/doc/data1.txt  imach$(VERSION).app/Contents/Resources/html ;\
-	cp ../../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/html ;\
-	cp ../../html/doc/biaspar.imach  imach$(VERSION).app/Contents/Resources/html ;\
+	cp -p ../../distributions/osx/IMaCh.icns  imach$(VERSION).app/Contents/Resources/IMaCh.icns ;\
+	cp ../../html/doc/data1.txt  imach$(VERSION).app/Contents/Resources/doc ;\
+	cp ../../html/doc/biaspar.log  imach$(VERSION).app/Contents/Resources/doc ;\
+	cp ../../html/doc/biaspar.imach  imach$(VERSION).app/Contents/Resources/doc ;\
+	cp ../../src/README.txt  imach$(VERSION).app/Contents/Resources/doc ;\
+	cp ../../tests/testV1V2.imach  imach$(VERSION).app/Contents/Resources/tests ;\
+	cp ../../tests/rtestV1V2.imach  imach$(VERSION).app/Contents/Resources/tests ;\
+	cp ../../tests/testV2.imach  imach$(VERSION).app/Contents/Resources/tests ;\
+	cp ../../tests/rtestV2.imach  imach$(VERSION).app/Contents/Resources/tests ;\
+	cp ../../tests/data/data2.txt  imach$(VERSION).app/Contents/Resources/tests/data ;\
 	rm -f imach$(VERSION).dmg ;\
 	pwd ;\
-	cp ../../distributions/osx/createdmg3.sh . ;\
+	cp ../../distributions/osx/createdmg4.sh . ;\
 	cp ../../distributions/osx/Background.png .;\
 	pwd ;\
-	./createdmg3.sh  --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION) ;\
-	mv  imach$(VERSION).dmg ../../src/Output/ ;)
+	./createdmg4.sh  --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION) ;\
+	cp  imach$(VERSION).dmg ../../src/Output/ ;)
 #	./create-dmg --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION).app 
 #	./createdmg2.sh --volname "IMaCh $(VERSION)" imach$(VERSION).dmg imach$(VERSION)
 
 md5:
 	ls Output/* | xargs md5sum
 upload:
-	rsync -v Output/IMaCh-0.98r0-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
-	rsync -v Output/imach0.98r0.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach-0.98r4-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/IMaCh-0.99a3-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach0.99a3.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/IMaCh-0.98r7-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach0.98r7.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach-0.99r9-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach0.99r9.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach-0.99r19-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach0.99r19.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach-0.99r21-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach0.99r21.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach-0.99r22-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach0.99r22.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach-0.99r23-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach0.99r23.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach-0.99r24-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+# rsync -v Output/imach0.99r24.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+# rsync -v Output/imach-0.99r24-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+# rsync -v Output/imach0.99r25.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+# rsync -v Output/imach-0.99r25-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+# rsync -v Output/imach-0.99r25-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach0.99r27.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v brouard@brouard.name:~/Documents/imach/cvs/imach/build/gnulinux/imach-0.99r33-1.x86_64.rpm Output/
+#	rsync -v Output/imach-0.99r33-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach-0.99r33-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+# rsync -v Output/imach0.99r26.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+# rsync -v Output/imach-0.99r26-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+# rsync -v Output/imach-0.99r26-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach-0.99r19-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+#	rsync -v Output/imach0.99r12-1.x86_64.rpm brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 #	rsync -v Output/* brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+	rsync -v Output/imach-0.99r34-icl-setup.exe brouard@henry.ined.fr:/home/euroreves/html/imach/Download
+	rsync -v Output/imach0.99r34.dmg brouard@henry.ined.fr:/home/euroreves/html/imach/Download
 
 imachcyg : imachcyg.o
 	$(CC) $(LFLAGS) -o imach imachcyg.o
@@ -528,8 +807,19 @@ imach.exe : imachw32.o
 	i386-mingw32-gcc  -mwindows -o imach.exe -lm imachw32.o
 	i386-mingw32-strip imach.exe
 
+valgrindtoto: valgrindtoto.c
+	gcc -o valgrindtoto -DCROSS=0 -g valgrindtoto.c
+valgrindtototest: valgrindtoto
+	valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ./valgrindtoto
+
 valgrind-test :  imach $(TESTFILE) 
 	valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ./imach $(TESTFILE)
+#	valgrind  --dsymutil=yes --leak-check=full --show-leak-kinds=all --track-origins=yes ./imach-0.98r-powellf1f3linmnb $(TESTFILE)
+# gdb -ex=r --args myprogram arg1 arg2
+# gdb -batch -x /tmp/cmds --args executablename arg1 arg2 arg3
+#  gdb -ex=r --args imachback /Users/nbrouard/Documents/Recherches/HRS/RAND_HRS/imachb.imach
+btest:  imachback $(TESTFILE) 
+	gdb ./imachback $(TESTFILE)
 test:  imach $(TESTFILE) 
 	gdb ./imach $(TESTFILE)