Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Aggiunta calcolo mediana in valori acquisiti

Browse Source
This commit is contained in:
Samuele Locatelli
2021-11-03 13:13:31 +01:00
parent 6e37beba5a
commit f026cc980d
3 changed files with 19 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-NEXT/DATA/CONF/PIZ04.json
+10 -10
View File
@@ -53,7 +53,7 @@
"tipoMem": "Real",
"index": 1,
"size": 2,
"func": "MAX",
"func": "MEDIAN",
"period": 60,
"factor": 360,
"minVal": 0,
@@ -67,7 +67,7 @@
"tipoMem": "Real",
"index": 3,
"size": 2,
"func": "MAX",
"func": "MEDIAN",
"period": 60,
"factor": 1,
"minVal": 0,
@@ -81,7 +81,7 @@
"tipoMem": "Real",
"index": 19,
"size": 2,
"func": "MAX",
"func": "MEDIAN",
"period": 60,
"factor": 1,
"minVal": 0,
@@ -95,7 +95,7 @@
"tipoMem": "Real",
"index": 21,
"size": 2,
"func": "MAX",
"func": "MEDIAN",
"period": 60,
"factor": 1,
"minVal": 0,
@@ -109,7 +109,7 @@
"tipoMem": "Real",
"index": 27,
"size": 2,
"func": "MAX",
"func": "MEDIAN",
"period": 60,
"factor": 1,
"minVal": -200,
@@ -123,7 +123,7 @@
"tipoMem": "Real",
"index": 11,
"size": 2,
"func": "MAX",
"func": "MEDIAN",
"period": 60,
"factor": 1,
"minVal": -200,
@@ -137,7 +137,7 @@
"tipoMem": "Real",
"index": 489,
"size": 2,
"func": "MAX",
"func": "MEDIAN",
"period": 60,
"factor": 1,
"minVal": -200,
@@ -151,7 +151,7 @@
"tipoMem": "Real",
"index": 491,
"size": 2,
"func": "MAX",
"func": "MEDIAN",
"period": 60,
"factor": 1,
"minVal": -200,
@@ -165,7 +165,7 @@
"tipoMem": "Real",
"index": 421,
"size": 2,
"func": "MAX",
"func": "MEDIAN",
"period": 60,
"factor": 1,
"minVal": -200,
@@ -179,7 +179,7 @@
"tipoMem": "Real",
"index": 423,
"size": 2,
"func": "MAX",
"func": "MEDIAN",
"period": 60,
"factor": 1,
"minVal": -200,
IOB-WIN-NEXT/IobGeneric.cs
+5 -18
View File
@@ -1,5 +1,6 @@
using IOB_UT_NEXT;
using MapoSDK;
using MathNet.Numerics.Statistics;
using Newtonsoft.Json;
using NLog;
using System;
@@ -21,7 +22,6 @@ namespace IOB_WIN_NEXT
{
public class IobGeneric
{
#region Protected Fields
/// <summary>
@@ -3696,27 +3696,17 @@ namespace IOB_WIN_NEXT
answ = TSVC_Data[VCName].dataArray.Average();
break;
case VC_func.MEDIAN:
answ = TSVC_Data[VCName].dataArray.Median();
break;
case VC_func.MIN:
answ = TSVC_Data[VCName].dataArray.Min();
#if false
answ = Double.MaxValue;
foreach (var item in TSVC_Data[VCName].dataArray)
{
answ = item > answ ? item : answ;
}
#endif
break;
case VC_func.MAX:
default:
answ = TSVC_Data[VCName].dataArray.Max();
#if false
answ = Double.MinValue;
foreach (var item in TSVC_Data[VCName].dataArray)
{
answ = item > answ ? item : answ;
}
#endif
break;
}
}
@@ -5158,7 +5148,6 @@ namespace IOB_WIN_NEXT
}
#endregion Public Methods
}
/// <summary>
@@ -5166,7 +5155,6 @@ namespace IOB_WIN_NEXT
/// </summary>
public class iobRefreshedEventArgs : EventArgs
{
#region Private Fields
/// <summary>
@@ -5200,6 +5188,5 @@ namespace IOB_WIN_NEXT
}
#endregion Public Properties
}
}
IOB-WIN-NEXT/packages.config
+4 -3
View File
@@ -2,7 +2,8 @@
<packages>
<package id="Autoupdater.NET.Official" version="1.7.0" targetFramework="net462" />
<package id="EasyModbusTCP" version="5.6.0" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2110.2619" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2111.313" targetFramework="net462" />
<package id="MathNet.Numerics" version="4.15.0" targetFramework="net462" />
<package id="Microsoft.CodeAnalysis.NetAnalyzers" version="5.0.3" targetFramework="net462" developmentDependency="true" />
<package id="Microsoft.VisualStudio.SlowCheetah" version="3.2.26" targetFramework="net40-client" developmentDependency="true" />
<package id="MTConnect.NET" version="2.9.1.28314" targetFramework="net40-client" />
@@ -15,11 +16,11 @@
<package id="OPCFoundation.NetStandard.Opc.Ua.Security.Certificates" version="1.4.367.42" targetFramework="net462" />
<package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net462" />
<package id="PrettyBin" version="1.1.0" targetFramework="net461" />
<package id="RestSharp" version="106.12.0" targetFramework="net462" />
<package id="RestSharp" version="106.13.0" targetFramework="net462" />
<package id="S7netplus" version="0.1.9" targetFramework="net462" />
<package id="Selenium.Firefox.WebDriver" version="0.27.0" targetFramework="net462" />
<package id="Selenium.WebDriver" version="4.0.1" targetFramework="net462" />
<package id="Selenium.WebDriver.ChromeDriver" version="95.0.4638.1700" targetFramework="net462" />
<package id="Selenium.WebDriver.ChromeDriver" version="95.0.4638.5401" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Formats.Asn1" version="5.0.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />