Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 1674e4c1 authored by Stefan MEYER's avatar Stefan MEYER
Browse files

correction the si refactoring

parent 3717d7aa
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
VectoCommon/VectoCommon/Utils/SI.cs
+ 10
− 5
View file @ 1674e4c1
......@@ -1176,13 +1176,16 @@ namespace TUGraz.VectoCommon.Utils
if (_reciproc)
{
siUnitsParm = SIUtils.SIUnitsMultFactor(siUnitsParm, -1); //ChangeNumeratorAndDenominator(siUnitsParm);
siUnitsParm = SIUtils.SIUnitsMultFactor(siUnitsParm, -1);
}
if (_reverse)
{
factor = 1 / factor;
if (_reciproc)
{
//factor = 1 / factor;
factor = 1 / factor;
}
if (!SIUtils.CompareSIUnits(siUnitsParm, si.SIUnits))
{
......@@ -1210,7 +1213,8 @@ namespace TUGraz.VectoCommon.Utils
{
if (factor.HasValue)
{
Val /= (factor.Value * _exponent);
//Val /= (factor.Value * _exponent);
Val /= Math.Pow(factor.Value, (double)_exponent);
}
}
......@@ -1218,7 +1222,8 @@ namespace TUGraz.VectoCommon.Utils
{
if (factor.HasValue)
{
Val *= (factor.Value * _exponent);
//Val *= (factor.Value * _exponent);
Val *= Math.Pow(factor.Value,(double)_exponent);
}
}
......
VectoCommon/VectoCommon/Utils/SIUtils.cs
+ 23
− 18
View file @ 1674e4c1
......@@ -73,7 +73,7 @@ namespace TUGraz.VectoCommon.Utils
private int[] units;
private double factorValue;
private double exponent;
private short exponent;
private short reciproc;
public enum GrammMode
......@@ -86,7 +86,7 @@ namespace TUGraz.VectoCommon.Utils
private GrammMode grammMode;
public UnitInstance(int[] param_units,
double param_factor, double param_exponent, short param_reciproc,
double param_factor, short param_exponent, short param_reciproc,
GrammMode param_grammMode)
{
units = param_units;
......@@ -159,7 +159,7 @@ namespace TUGraz.VectoCommon.Utils
{
grammMode = GrammMode.KiloGramm;
}
units[0] += 1 * reciproc;
units[0] += 1 * reciproc * exponent;
CalcFactorValue(Op.Div, 1000);
//factorValue /= 1000;
return new UnitInstance(units, factorValue, exponent, reciproc, grammMode);
......@@ -178,7 +178,7 @@ namespace TUGraz.VectoCommon.Utils
{
get
{
units[2] += 1 * reciproc;
units[2] += 1 * reciproc * exponent;
CalcFactorValue(Op.Mult, 3600);
//factorValue *= 3600;
return new UnitInstance(units, factorValue, exponent, reciproc, grammMode);
......@@ -213,7 +213,8 @@ namespace TUGraz.VectoCommon.Utils
{
get
{
units[1] += 1 * reciproc;
//units[1] += 1 * reciproc;
units[1] += 1 * reciproc * exponent;
return new UnitInstance(units, factorValue, exponent, reciproc, grammMode);
}
}
......@@ -221,8 +222,9 @@ namespace TUGraz.VectoCommon.Utils
{
get
{
CalcFactorValue(Op.Div, 1000);
//CalcFactorValue(Op.Div, 1000);
//factorValue /= 1000;
CalcFactorValue(Op.Mult, Math.Pow(factorValue / 1000, exponent));
return new UnitInstance(units, factorValue, exponent, reciproc, grammMode);
}
}
......@@ -230,7 +232,9 @@ namespace TUGraz.VectoCommon.Utils
{
get
{
CalcFactorValue(Op.Div, 100);
//CalcFactorValue(Op.Div, 100);
//Val *= Math.Pow(factor.Value, (double)_exponent);
CalcFactorValue(Op.Mult, Math.Pow(factorValue/100, exponent));
//factorValue /= 100;
return new UnitInstance(units, factorValue, exponent, reciproc, grammMode);
}
......@@ -239,8 +243,9 @@ namespace TUGraz.VectoCommon.Utils
{
get
{
CalcFactorValue(Op.Div, 10);
//CalcFactorValue(Op.Div, 10);
//factorValue /= 10;
CalcFactorValue(Op.Mult, Math.Pow(factorValue / 10, exponent));
return new UnitInstance(units, factorValue, exponent, reciproc, grammMode);
}
}
......@@ -248,7 +253,7 @@ namespace TUGraz.VectoCommon.Utils
{
get
{
units[2] += 1 * reciproc;
units[2] += 1 * reciproc * exponent;
CalcFactorValue(Op.Mult, 60);
//factorValue *= 60;
return new UnitInstance(units, factorValue, exponent, reciproc, grammMode);
......@@ -258,9 +263,9 @@ namespace TUGraz.VectoCommon.Utils
{
get
{
units[0] += 1 * reciproc;
units[1] += 1 * reciproc;
units[2] -= 2 * reciproc;
units[0] += 1 * reciproc * exponent;
units[1] += 1 * reciproc * exponent;
units[2] -= 2 * reciproc * exponent;
return new UnitInstance(units, factorValue, exponent, reciproc, grammMode);
}
}
......@@ -302,7 +307,7 @@ namespace TUGraz.VectoCommon.Utils
{
get
{
units[2] += 1 * reciproc;
units[2] += 1 * reciproc * exponent;
return new UnitInstance(units, factorValue, exponent, reciproc, grammMode);
}
}
......@@ -310,7 +315,7 @@ namespace TUGraz.VectoCommon.Utils
{
get
{
exponent = 2 * reciproc;
exponent = (short)(2 * reciproc);
return new UnitInstance(units, factorValue, exponent, reciproc, grammMode);
}
}
......@@ -318,7 +323,7 @@ namespace TUGraz.VectoCommon.Utils
{
get
{
units[0] += 1 * reciproc;
units[0] += 1 * reciproc * exponent;
CalcFactorValue(Op.Mult, 1000);
return new UnitInstance(units, factorValue, exponent, reciproc, grammMode);
}
......@@ -327,9 +332,9 @@ namespace TUGraz.VectoCommon.Utils
{
get
{
units[0] += 1 * reciproc;
units[1] += 2 * reciproc;
units[2] -= 3 * reciproc;
units[0] += 1 * reciproc * exponent;
units[1] += 2 * reciproc * exponent;
units[2] -= 3 * reciproc * exponent;
return new UnitInstance(units, factorValue, exponent, reciproc, grammMode);
}
}
......
VectoCore/VectoCoreTest/Utils/AssertHelper.cs
+ 1
− 1
View file @ 1674e4c1
......@@ -83,7 +83,7 @@ namespace TUGraz.VectoCore.Tests.Utils
}
}
[DebuggerHidden]
//[DebuggerHidden]
public static void AreRelativeEqual(double? expected, double? actual, string message = null,
double toleranceFactor = DoubleExtensionMethods.ToleranceFactor)
{
......
VectoCore/VectoCoreTest/Utils/SITest.cs
+ 13
− 2
View file @ 1674e4c1
......@@ -575,9 +575,20 @@ namespace TUGraz.VectoCore.Tests.Utils
[TestMethod]
public void SI_NewTests()
{
var val1 = 5.SI().Cubic.Centi.Meter;
Assert.AreEqual("0.000005 [m^3]", val1);
var val1 = 5.SI().Cubic.Dezi.Meter;
Assert.AreEqual("m^3", val1.GetUnitString());
AssertHelper.AreRelativeEqual(0.005, val1);
var uni = Unit.SI.Cubic.Dezi.Meter;
Assert.AreEqual(3, uni.GetSIUnits()[1]); //cubic meter
AssertHelper.AreRelativeEqual(0.001, uni.Getfactor());
var val2 = 7.SI().Cubic.Dezi.Meter.ConvertTo(Unit.SI.Cubic.Dezi.Meter);
Assert.AreEqual("m^3", val2.GetUnitString());
Assert.AreEqual(0.0007, val2.Value());
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about