michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some shared classes and interfaces moved to project Common, re-factorization.

Browse Source
This commit is contained in:
Milan Hanajik
2022-01-23 19:56:15 +01:00
parent a4a583c41a
commit 947d0198c1
163 changed files with 1102 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Config/Entities/ComponentProcedure.cs
+1
View File
@@ -3,6 +3,7 @@
///
using System;
using System.IO;
using Common;
namespace Config.Entities
{
Config/Entities/ComponentTest.cs
+1
View File
@@ -3,6 +3,7 @@
///
using System;
using System.IO;
using Common;
namespace Config.Entities
{
Config/Entities/IParamsProvider.cs
-76
View File
@@ -1,76 +0,0 @@
///
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using Common;
namespace Config.Entities
{
public interface IParamsProvider
{
/// <summary>
/// Get XML Serializer
/// </summary>
XmlSerializer GetSerializer();
string ComponentName { get; }
/// <summary>
/// Number of parameters
/// </summary>
int ParamsCount();
/// <summary>
/// Returns a parameter name
/// </summary>
/// <param name="ix">Zero based index of the parameter</param>
string ParamName(int ix);
/// <summary>
/// Returns a list of possible values of one parameter (ComboBox when editing) or null (Textbox when editing).
/// </summary>
/// <param name="ix">Zero based index of the parameter</param>
ICollection<string> ParamValues(int ix);
/// <summary>
/// Returns a parameter value in the string form
/// </summary>
/// <param name="ix">Zero based index of the parameter</param>
string ToString(int ix);
/// <summary>
/// Initialize values of all parameters
/// </summary>
void InitializeAll();
/// <summary>
/// Validates the string representation of a parameter
/// </summary>
/// <param name="ix">Zero based index of the parameter</param>
/// <param name="strValue">String representation of the parameter</param>
/// <param name="message">Warning message in case the string is wrong or null</param>
/// <returns>true = string is OK, false = string is wrong (see 'message')</returns>
bool ValidateParam(int ix, string strValue, out string message);
/// <summary>
/// Update the parameter from a string
/// </summary>
/// <param name="ix">Zero based index of the parameter</param>
/// <param name="strValue">String representation of the parameter</param>
CfgUpdateFlags UpdateParam(int ix, string strValue);
/// <summary>
/// Updates DB entities for related parameters
/// </summary>
/// <returns>true when successful</returns>
bool UpdateEmbeddedDbEntity();
/// <summary>
/// Creates an object copy
/// </summary>
/// <returns></returns>
IParamsProvider Clone();
}
}
Config/Entities/MeasurementCorrection.cs
+58 -3
View File
@@ -1,11 +1,12 @@
///
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
namespace Config.Entities
{
public class MeasurementCorrection
public class MeasurementCorrection : Common.IMeasurementCorrection
{
public virtual int Id { get; protected set; }
public virtual int RangeIx { get; set; } /// 0..5
@@ -21,5 +22,59 @@ namespace Config.Entities
{
RangeIx = rangeIx;
}
}
/// <summary>
/// Calculates corrected value from a list of corrections by interpolation.
/// It is assumed that values in the list 'corrections' are sorted.
/// </summary>
/// <param name="rawMeasurement">Raw uncorrected value</param>
/// <param name="corrections">Sorted (value, correction) pairs</param>
/// <returns>Corrected value</returns>
public static double CorrectedValue(double rawValue, IList<MeasurementCorrection> corrections)
{
return rawValue + GetCorrection(rawValue, corrections);
}
/// <summary>
/// Get a correction from a list of corrections by interpolation.
/// It is assumed that values in the list 'corrections' are sorted.
/// </summary>
/// <param name="rawMeasurement">Raw uncorrected value</param>
/// <param name="corrections">Sorted (value, correction) pairs</param>
/// <returns>Corrected value</returns>
public static double GetCorrection(double rawValue, IList<MeasurementCorrection> corrections)
{
if ((corrections == null) || (corrections.Count == 0)) return 0; /// No correction
if (rawValue < corrections[0].Measurement)
{
/// rawValue is below the lowest value in the correction table
return corrections[0].Correction;
}
for (int i = 1; i < corrections.Count; i++)
{
if (rawValue < corrections[i].Measurement)
{
double d1 = rawValue - corrections[i - 1].Measurement;
double d2 = corrections[i].Measurement - rawValue;
if (d1 + d2 <= float.Epsilon)
{
/// Neigboring values in the corection table are close to each other -> calculate the average
return (corrections[i - 1].Correction + corrections[i].Correction) / 2.0;
}
else
{
/// Interpolate the correction from neigboring values in the corection table
return (corrections[i - 1].Correction * d2 + corrections[i].Correction * d1) / (d1 + d2);
}
}
}
/// rawValue is above the highest value in the correction table
return corrections[corrections.Count - 1].Correction;
}
}
}
Config/Entities/Uncertainty.cs
+2 -2
View File
@@ -1,11 +1,11 @@
///
/// Copyright (c) 2019 Sensus Slovensko a.s.
/// Copyright (c) 2019-2021 Sensus Slovensko a.s.
///
using System;
namespace Config.Entities
{
public class Uncertainty
public class Uncertainty : Common.IUncertainty
{
public virtual int Id { get; protected set; }
public virtual float Measurement { get; set; }