[med-svn] [Git][med-team/simrisc][upstream] New upstream version 15.04.00

[Frank B. Brokken (@fbb-guest)]

Frank B. Brokken pushed to branch upstream at Debian Med / simrisc


Commits:
9ab146c2 by Frank B. Brokken at 2023-12-09T13:36:43+01:00
New upstream version 15.04.00
- - - - -


6 changed files:

- VERSION
- build
- changelog
- + icmake/beep
- scenario/setdeath.cc
- scenario/writeparameters.cc


Changes:

=====================================
VERSION
=====================================
@@ -1,3 +1,3 @@
 #define AUTHOR  "Frank B. Brokken (f.b.brokken at rug.nl)";
-#define VERSION "15.03.01"
+#define VERSION "15.04.00"
 #define YEARS "2020-2023"


=====================================
build
=====================================
@@ -14,6 +14,7 @@ int g_echo = ON;
 #include "icmake/backtick"
 
 #include "icmake/setopt"
+#include "icmake/beep"      // beep if /usr/local/bin/beep exists and exit
 #include "icmake/run"
 #include "icmake/md"
 
@@ -84,7 +85,7 @@ void main(int argc, list argv)
     if (option == "library")
     {
         system("icmbuild library");
-        exit(0);
+        beep();
     }
 
     if (option == "program")
@@ -93,8 +94,7 @@ void main(int argc, list argv)
 
         if (argv[2] == "strip")
             system("strip " TMP_DIR "/bin/binary");
-
-        exit(0);
+        beep();
     }
 
     if (option == "xref")
@@ -102,7 +102,9 @@ void main(int argc, list argv)
         system("icmbuild program");
         run("oxref -t main -r oxref/replace -fxs tmp/main.o tmp/lib"
                                             LIBRARY ".a > " PROGRAM ".xref");
-        exit(0);
+        if (argv[2] == "strip")
+            system("strip " TMP_DIR "/bin/binary");
+        beep();
     }
 
     printf("Usage: build [-q] what\n"


=====================================
changelog
=====================================
@@ -1,3 +1,10 @@
+simrisc (15.04.00)
+
+  * The params.txt file also contains the cumulative death-proportions if
+    specified (currently: with lung-cancer simulations)
+
+ -- Frank B. Brokken <f.b.brokken at rug.nl>  Thu, 07 Dec 2023 21:10:54 +0100
+
 simrisc (15.03.01)
 
   * When reading the cumulative death proportions errors in the specification


=====================================
icmake/beep
=====================================
@@ -0,0 +1,6 @@
+void beep()
+{
+    if (exists("/usr/local/bin/beep"))
+        system("/usr/local/bin/beep");
+    exit(0);
+}


=====================================
scenario/setdeath.cc
=====================================
@@ -28,3 +28,4 @@ void Scenario::setDeath()
 
     checkCumDeath(cumDeath, previous);
 }
+


=====================================
scenario/writeparameters.cc
=====================================
@@ -10,6 +10,23 @@ void Scenario::writeParameters(ostream &out, size_t iter) const
         "  n iterations: " << d_nIterations << "\n"
         "  n cases:      " << d_nCases << "\n"
         "  seed          " << d_seed << "\n"
-        "  spread:       " << s_bool[Globals::vary()] << "\n"
-        "\n";
+        "  spread:       " << s_bool[Globals::vary()] << '\n';
+
+    if (d_cumDeathProportions.size() != 0)
+    {
+        out << "  death:";
+
+        size_t idx = 0;         
+        for (double prop: d_cumDeathProportions)
+        {
+            if (idx++ % 10 == 0)
+                out << '\n' <<
+                        setw(7) << idx << ':';
+            out << ' ' << prop;
+        }
+        if (idx % 10 != 0)
+            out.put('\n');
+    }
+
+    out.put('\n');
 }



View it on GitLab: https://salsa.debian.org/med-team/simrisc/-/commit/9ab146c2176e773fd7856f64a3bc917ab3e9e283

-- 
View it on GitLab: https://salsa.debian.org/med-team/simrisc/-/commit/9ab146c2176e773fd7856f64a3bc917ab3e9e283
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20231209/d5a4c139/attachment-0001.htm>