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 1c4d274..7b18968 100644
--- a/MP.MONO.UI/MP.MONO.UI.csproj
+++ b/MP.MONO.UI/MP.MONO.UI.csproj
@@ -5,7 +5,7 @@
enable
enable
AnyCPU;x86;x64
- 1.2.2209.2308
+ 1.2.2209.2216
diff --git a/MP.MONO.UI/Resources/ChangeLog.html b/MP.MONO.UI/Resources/ChangeLog.html
index 720cb4e..4541d50 100644
--- a/MP.MONO.UI/Resources/ChangeLog.html
+++ b/MP.MONO.UI/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
MAPO-MONO
- Version: 1.2.2209.2308
+ Version: 1.2.2209.2216
Release Note:
-
diff --git a/MP.MONO.UI/Resources/VersNum.txt b/MP.MONO.UI/Resources/VersNum.txt
index db808ef..e5ec7b6 100644
--- a/MP.MONO.UI/Resources/VersNum.txt
+++ b/MP.MONO.UI/Resources/VersNum.txt
@@ -1 +1 @@
-1.2.2209.2308
+1.2.2209.2216
diff --git a/MP.MONO.UI/Resources/manifest.xml b/MP.MONO.UI/Resources/manifest.xml
index e9f0889..d4e91b6 100644
--- a/MP.MONO.UI/Resources/manifest.xml
+++ b/MP.MONO.UI/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 1.2.2209.2308
+ 1.2.2209.2216
http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip
http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html
false