From 6f502f0b59109042f820455bea9b935689d2eb7f Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 23 Sep 2022 08:39:26 +0200
Subject: [PATCH] =?UTF-8?q?Update=20SIM=20allarmi=20-=20maggior=20probabil?=
 =?UTF-8?q?it=C3=A0=20allarmi=20"bassi"=20in=20SIM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MP.MONO.SIM/Program.cs              | 26 +++++++++++++++++++++-----
 MP.MONO.SIM/appsettings.json        |  2 +-
 MP.MONO.UI/MP.MONO.UI.csproj        |  2 +-
 MP.MONO.UI/Resources/ChangeLog.html |  2 +-
 MP.MONO.UI/Resources/VersNum.txt    |  2 +-
 MP.MONO.UI/Resources/manifest.xml   |  2 +-
 6 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/MP.MONO.SIM/Program.cs b/MP.MONO.SIM/Program.cs
index 2104cf1..97760ce 100644
--- a/MP.MONO.SIM/Program.cs
+++ b/MP.MONO.SIM/Program.cs
@@ -285,8 +285,8 @@ void simAlarms()
                     // verifico situazione allarmi già presenti
                     foreach (var singleAlarm in CurrActiveAlarm)
                     {
-                        // 1: seleziono allarmi se ce ne fossero e la loro durata è <= limite * rand (50-150) x rimetterli in elenco
-                        if (adesso.Subtract(singleAlarm.Value).TotalSeconds < MaxDurationAllarmi * rand.Next(50, 150) / 100)
+                        // 1: seleziono allarmi se ce ne fossero e la loro durata è <= limite * rand (50-200) x rimetterli in elenco
+                        if (adesso.Subtract(singleAlarm.Value).TotalSeconds < MaxDurationAllarmi * ((double)rand.Next(50, 200) / 100))
                         {
                             NewActiveAlarm.Add(singleAlarm.Key, singleAlarm.Value);
                         }
@@ -294,7 +294,6 @@ void simAlarms()
                     // ciclo x numero banchi da config...
                     foreach (var alarmGroup in alarmsRawConf)
                     {
-
                         // simulo e limito insorgenza NUOVI allarmi al percAllarmi/100 dei casi
                         newAlarm = rand.Next(0, 100) <= percAllarmi;
                         if (newAlarm)
@@ -303,8 +302,25 @@ void simAlarms()
                             // ciclo x aggiungere il numero di allarmi indicato
                             for (int i = 0; i < numNew; i++)
                             {
-                                // seleziono uno degli allarmi del banco
-                                int alarmIndex = rand.Next(0, alarmGroup.messages.Count);
+                                // seleziono uno degli allarmi del banco.. dando + peso agli "allarmi bassi"
+                                int alarmIndex = 0;
+                                int msgBlock = rand.Next(1, 5);
+                                switch (msgBlock)
+                                {
+                                    case 1:
+                                        alarmIndex = rand.Next(0, alarmGroup.messages.Count / 4);
+                                        break;
+                                    case 2:
+                                        alarmIndex = rand.Next(0, alarmGroup.messages.Count / 2);
+                                        break;
+                                    case 3:
+                                        alarmIndex = rand.Next(0, alarmGroup.messages.Count * 3 / 4);
+                                        break;
+                                    case 4:
+                                    default:
+                                        alarmIndex = rand.Next(0, alarmGroup.messages.Count);
+                                        break;
+                                }
                                 string rndNewAlarm = alarmGroup.messages[alarmIndex];
                                 if (!NewActiveAlarm.ContainsKey(rndNewAlarm))
                                 {
diff --git a/MP.MONO.SIM/appsettings.json b/MP.MONO.SIM/appsettings.json
index 4604ffb..4fb6ea8 100644
--- a/MP.MONO.SIM/appsettings.json
+++ b/MP.MONO.SIM/appsettings.json
@@ -44,7 +44,7 @@
   "SimPar": {
     "MinSaveIntSec": 5,
     "PercAllarmi": 10,
-    "MaxAddAllarmi": 3,
+    "MaxAddAllarmi": 5,
     "MaxDurationAllarmi": 10
   }
 }
diff --git a/MP.MONO.UI/MP.MONO.UI.csproj b/MP.MONO.UI/MP.MONO.UI.csproj
index fd44af2..7b18968 100644
--- a/MP.MONO.UI/MP.MONO.UI.csproj
+++ b/MP.MONO.UI/MP.MONO.UI.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <Platforms>AnyCPU;x86;x64</Platforms>
-    <Version>1.2.2209.2215</Version>
+    <Version>1.2.2209.2216</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html
index 2733d5e..4541d50 100644
--- a/MP.MONO.UI/Resources/ChangeLog.html
+++ b/MP.MONO.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>MAPO-MONO</i>
-    <h4>Version: 1.2.2209.2215</h4>
+    <h4>Version: 1.2.2209.2216</h4>
     <br /> Release Note:
     <ul>
         <li>
diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt
index 8960e4d..e5ec7b6 100644
--- a/MP.MONO.UI/Resources/VersNum.txt
+++ b/MP.MONO.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2209.2215
+1.2.2209.2216
diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml
index 2be2e4f..d4e91b6 100644
--- a/MP.MONO.UI/Resources/manifest.xml
+++ b/MP.MONO.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.2.2209.2215</version>
+  <version>1.2.2209.2216</version>
   <url>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>