From 0ee87b9c77fb413fe3c652d964eca4aad41fdbb2 Mon Sep 17 00:00:00 2001 From: "N. Brouard" Date: Tue, 15 Mar 2022 18:43:13 +0000 Subject: [PATCH] Summary: IMaCh-0.99r24 --- CMakeLists.txt | 12 +- distributions/windows/mybuildicl32.bat | 1 + html/doc/biaspar-cov.htm | 6 +- html/doc/biaspar.gp | 2 +- html/doc/biaspar.htm | 8 +- html/doc/biaspar.imach | 2 +- html/doc/biaspar.log | 637 +++++++++++++------------ 7 files changed, 335 insertions(+), 333 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d328d4..9f660f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ SET(IMACH_VERSION_MINOR 99r24) SET(IMACH_VERSION_PATCH 0) SET(IMACH_VERSION_NOTE "") SET(IMACH_VERSION ${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}) -SET(@APPNAME@ IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}) +SET(@APPNAME@ imach-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}) SET(@NOTINNOREG@ ) SET(@NOREG@ ) SET(@IMACHSETUPVERSION@ imach-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR}-icl-setup) @@ -29,7 +29,7 @@ SET(@COPYRIGHT@ "Copyright (C) 2002-2015 EUROREVES-Institut de longevite-Japan #MATH(EXPR IMACH_VERSION_NUMBER "100000*${IMACH_VERSION_MAJOR} + 100*${IMACH_VERSION_MINOR} + ${IMACH_VERSION_PATCH}") # #PROJECT(IMaCh${IMACH_VERSION_MAJOR}) -PROJECT (IMaCh) +PROJECT (imach) CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11) @@ -55,8 +55,8 @@ CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/tests/data/data2.txt" "tests/data/data2.tx set (imach_SRCS ./src/imach.c) SET( CMAKE_VERBOSE_MAKEFILE on ) #SET(CMAKE_INSTALL_PREFIX "/usr/local") -ADD_EXECUTABLE (IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} ${imach_SRCS}) -INSTALL(TARGETS IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} DESTINATION bin COMPONENT binaries ) +ADD_EXECUTABLE (imach-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} ${imach_SRCS}) +INSTALL(TARGETS imach-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} DESTINATION bin COMPONENT binaries ) #INSTALL(TARGETS imach DESTINATION bin COMPONENT binaries ) ADD_SUBDIRECTORY(html) ADD_SUBDIRECTORY(tests) @@ -68,7 +68,7 @@ ADD_SUBDIRECTORY(tests) #endif() if(UNIX) # set(CMAKE_CXX_COMPILER "gcc") - target_link_libraries(IMaCh-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} m) + target_link_libraries(imach-${IMACH_VERSION_MAJOR}.${IMACH_VERSION_MINOR} m) set(BINDIR "${CMAKE_INSTALL_PREFIX}/bin") set(DOCDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/doc") set(TESTDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/tests") @@ -131,7 +131,7 @@ set(CPACK_RPM_PACKAGE_URL "http://euroreves.ined.fr/imach") IF(UNIX) SET(CPACK_RPM_PACKAGE_LICENSE "GPL") SET(CPACK_RPM_PACKAGE_GROUP "Applications/Sciences") - SET(CPACK_RPM_PACKAGE_REQUIRES "gnuplot >= 4.2, cmake >= 2.8") + SET(CPACK_RPM_PACKAGE_REQUIRES "gnuplot >= 5.0, cmake >= 2.8") SET(CPACK_GENERATOR "TXZ") SET(CPACK_SOURCE_GENERATOR "TXZ") SET(CPACK_SOURCE_TBZ2 "OFF") diff --git a/distributions/windows/mybuildicl32.bat b/distributions/windows/mybuildicl32.bat index a57a0ef..df4bb21 100644 --- a/distributions/windows/mybuildicl32.bat +++ b/distributions/windows/mybuildicl32.bat @@ -9,6 +9,7 @@ rem cd rem cd imachcvs\NetBeans\imach\build\icl32 rem cd imach\imach-gui\build\icl32 cd %2%3\icl32 +date /T call "C:\Program Files (x86)\Intel\Composer XE 2015\bin\ipsxe-comp-vars.bat" ia32 vs2013 call cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS_RELEASE:STRING="/MT /O2 /Ob2 /D NDEBUG" call cmake --config Release diff --git a/html/doc/biaspar-cov.htm b/html/doc/biaspar-cov.htm index 9854ff8..19a332a 100644 --- a/html/doc/biaspar-cov.htm +++ b/html/doc/biaspar-cov.htm @@ -1,6 +1,6 @@ IMaCh Cov biaspar-cov.htm - 0.99r19
$Revision$ $Date$
+ 0.99r24
$Revision$ $Date$
Title=1st_example
Datafile=data1.txt Firstpass=1 Lastpass=4 Stepm=1 Weight=0 Model=1+age+
Current page is file biaspar-cov.htm
@@ -27,7 +27,7 @@ Ellipsoids of confidence centered on point (pij, pkl) are
Correlation at age 70 (-0.461), 75 (-0.531), 80 (-0.579), 85 (-0.506), 90 (-0.442), 95 (-0.379),


Ellipsoids of confidence cov(p23,p21) expressed in year-1 : biaspar/VARPIJGR_biaspar_123-21.svg,
-
Correlation at age 70 (-0.033), 75 (-0.032), 80 (-0.038), 85 (-0.055), 90 (-0.060), 95 (-0.050),
Local time at start Wed May 22 22:32:36 2019 -
Local time at end Wed May 22 22:34:09 2019 +
Correlation at age 70 (-0.033), 75 (-0.032), 80 (-0.038), 85 (-0.055), 90 (-0.060), 95 (-0.050),
Local time at start Thu May 20 15:42:13 2021 +
Local time at end Thu May 20 15:43:12 2021
\ No newline at end of file diff --git a/html/doc/biaspar.gp b/html/doc/biaspar.gp index 2f34b7e..ba9f46e 100644 --- a/html/doc/biaspar.gp +++ b/html/doc/biaspar.gp @@ -1,5 +1,5 @@ -# IMaCh-0.99r19 +# IMaCh-0.99r24 # biaspar.gp set datafile missing 'NaNq' cd "/Users/nbrouard/Documents/imach/cvs/imach/html/doc" diff --git a/html/doc/biaspar.htm b/html/doc/biaspar.htm index 6921d63..620dc06 100644 --- a/html/doc/biaspar.htm +++ b/html/doc/biaspar.htm @@ -4,7 +4,7 @@ IMaCh biaspar.htm IMaCh for Interpolated Markov Chain
Sponsored by Copyright (C) 2002-2015 INED-EUROREVES-Institut de longévité-2013-2016-Japan Society for the Promotion of Sciences 日本学術振興会 (Grant-in-Aid for Scientific Research 25293121) - Intel Software 2015-2018

-IMaCh-0.99r19
$Revision$ $Date$
+IMaCh-0.99r24
$Revision$ $Date$
Title=1st_example
Datafile=data1.txt Firstpass=1 Lastpass=4 Stepm=1 Weight=0 Model=1+age+

Parameter line 2