Added some tests & fixed bug in code generation for conversion formula.

GuOrg · Nov 7, 2014 · 092ae25 · 092ae25
1 parent 2698f7c
commit 092ae25
Show file tree

Hide file tree

Showing 19 changed files with 225 additions and 293 deletions.
diff --git a/Gu.Units.Generator.Tests/QuantityTests.cs b/Gu.Units.Generator.Tests/QuantityTests.cs
@@ -85,7 +85,7 @@ public void TimeOverloads()
         public void Inversions()
         {
             var actual = _settings.Time.Inverse;
-            Assert.AreEqual(_settings.Frequency.ToString(), actual.ToString());
+            Assert.AreEqual("1 / Time = Frequency", actual.ToString());
             Assert.IsNull(_settings.Length.Inverse);
         }
     }

diff --git a/Gu.Units.Generator/Descriptors/InverseOverload.cs b/Gu.Units.Generator/Descriptors/InverseOverload.cs
@@ -0,0 +1,29 @@
+namespace Gu.Units.Generator
+{
+    using System.Linq;
+
+    public class InverseOverload
+    {
+        public InverseOverload(Quantity original, Quantity inverted)
+        {
+            this.Original = original;
+            this.Inverted = inverted;
+        }
+
+        public Quantity Original { get; private set; }
+
+        public Quantity Inverted { get; private set; }
+
+        public override string ToString()
+        {
+            return string.Format("1 / {0} = {1}", this.Original.ClassName, this.Inverted.ClassName);
+        }
+
+        public static bool IsInverse(Quantity left, Quantity right)
+        {
+            var leftParts = UnitParts.CreateFrom(left);
+            var rightParts = UnitParts.CreateFrom(right);
+            return leftParts.Flattened.SequenceEqual(rightParts.Flattened.Select(x => x ^ -1));
+        }
+    }
+}
diff --git a/Gu.Units.Generator/Descriptors/OperatorOverload.cs b/Gu.Units.Generator/Descriptors/OperatorOverload.cs
@@ -133,12 +133,5 @@ private int FindPower(Quantity left, Quantity right, Quantity result)
             //    throw new ArgumentException("message");
             //}
         }
-
-        public static bool IsInverse(Quantity left, Quantity right)
-        {
-            var leftParts = UnitParts.CreateFrom(left);
-            var rightParts = UnitParts.CreateFrom(right);
-            return leftParts.Flattened.SequenceEqual(rightParts.Flattened.Select(x => x ^ -1));
-        }
     }
 }
diff --git a/Gu.Units.Generator/Descriptors/Quantity.cs b/Gu.Units.Generator/Descriptors/Quantity.cs
@@ -137,15 +137,20 @@ public IEnumerable<OperatorOverload> OperatorOverloads
         }
 
         [XmlIgnore]
-        public Quantity Inverse
+        public InverseOverload Inverse
         {
             get
             {
-                if (Settings == null || Settings.Quantities == null)
+                if (Settings == null || Settings.Quantities == null) // For the template in designtime
                 {
                     return null;
                 }
-                return Settings.Quantities.FirstOrDefault(x => x != null && OperatorOverload.IsInverse(this, x));
+                var inverse = Settings.Quantities.FirstOrDefault(x => x != null && InverseOverload.IsInverse(this, x));
+                if (inverse == null)
+                {
+                    return null;
+                }
+                return new InverseOverload(this, inverse);
             }
         }
 

diff --git a/Gu.Units.Generator/GeneratorSettings.xml b/Gu.Units.Generator/GeneratorSettings.xml
@@ -1158,9 +1158,9 @@
       </Conversions>
     </SiUnit>
     <SiUnit>
-      <ClassName>Fractions</ClassName>
+      <ClassName>Scalar</ClassName>
       <Symbol>ul</Symbol>
-      <QuantityName>Fraction</QuantityName>
+      <QuantityName>Unitless</QuantityName>
       <Conversions>
         <Conversion>
           <ClassName>PartsPerMillion</ClassName>

diff --git a/Gu.Units.Generator/Gu.Units.Generator.csproj b/Gu.Units.Generator/Gu.Units.Generator.csproj
@@ -83,6 +83,7 @@
     </ApplicationDefinition>
     <Compile Include="ConversionsVm.cs" />
     <Compile Include="Descriptors\ConversionFormula.cs" />
+    <Compile Include="Descriptors\InverseOverload.cs" />
     <Compile Include="Descriptors\IUnit.cs" />
     <Compile Include="Descriptors\Names.cs" />
     <Compile Include="Descriptors\OperatorOverload.cs" />
@@ -192,11 +193,6 @@
     <Resource Include="GeneratorSettings.xml">
       <SubType>Designer</SubType>
     </Resource>
-    <Resource Include="Templates\Unit.txt">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Unit.tt</DependentUpon>
-    </Resource>
     <Content Include="Templates\QuantityGenerator.txt">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>

diff --git a/Gu.Units.Generator/MainWindow.xaml b/Gu.Units.Generator/MainWindow.xaml
@@ -157,13 +157,16 @@
                     </GroupBox>
 
                     <GroupBox Grid.Row="1" Header="Overloads">
-                        <ItemsControl ItemsSource="{Binding Conversions.BaseUnit.Quantity.OperatorOverloads}">
-                            <ItemsControl.ItemTemplate>
-                                <DataTemplate DataType="{x:Type generator:OperatorOverload}">
-                                    <TextBlock Text="{Binding}" />
-                                </DataTemplate>
-                            </ItemsControl.ItemTemplate>
-                        </ItemsControl>
+                        <StackPanel>
+                            <ItemsControl ItemsSource="{Binding Conversions.BaseUnit.Quantity.OperatorOverloads}">
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate DataType="{x:Type generator:OperatorOverload}">
+                                        <TextBlock Text="{Binding}" />
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                            <TextBlock Text="{Binding Conversions.BaseUnit.Quantity.Inverse}" />
+                        </StackPanel>
                     </GroupBox>
 
                     <GroupBox Grid.Row="2" Header="Prefixes">

diff --git a/Gu.Units.Generator/Templates/Quantity.tt b/Gu.Units.Generator/Templates/Quantity.tt
@@ -157,9 +157,9 @@ namespace <#= Settings.Namespace #>
 		{
 		#>
 
-        public static <#= quantity.Inverse.ClassName #> operator/(double left, <#= quantity.ClassName #> right)
+        public static <#= quantity.Inverse.Inverted.ClassName #> operator/(double left, <#= quantity.ClassName #> right)
         {
-            return <#= quantity.Inverse.ClassName #>.From<#= quantity.Inverse.Unit.ClassName #>(left / right.<#= quantity.Unit.ClassName #>);
+            return <#= quantity.Inverse.Inverted.ClassName #>.From<#= quantity.Inverse.Inverted.Unit.ClassName #>(left / right.<#= quantity.Unit.ClassName #>);
         }
 <#
 		} 

diff --git a/Gu.Units.Generator/Templates/QuantityGenerator.txt b/Gu.Units.Generator/Templates/QuantityGenerator.txt
@@ -22,8 +22,6 @@ Read Settings found 29 units
 
 //-> Force.generated.cs
 
-//-> Fraction.generated.cs
-
 //-> Frequency.generated.cs
 
 //-> Inductance.generated.cs
@@ -52,6 +50,8 @@ Read Settings found 29 units
 
 //-> Torque.generated.cs
 
+//-> Unitless.generated.cs
+
 //-> Voltage.generated.cs
 
 //-> Volume.generated.cs
@@ -83,7 +83,7 @@ Read Settings found 29 units
 // Gu.Units\Gu.Units\Area.generated.cs
 // Gu.Units\Gu.Units\LuminousIntensity.generated.cs
 // Gu.Units\Gu.Units\Current.generated.cs
-// Gu.Units\Gu.Units\Fraction.generated.cs
+// Gu.Units\Gu.Units\Unitless.generated.cs
 // Gu.Units\Gu.Units\Angle.generated.cs
 // Gu.Units\Gu.Units\Temperature.generated.cs
 // Gu.Units\Gu.Units\Time.generated.cs

diff --git a/Gu.Units.Generator/Templates/Unit.tt b/Gu.Units.Generator/Templates/Unit.tt
@@ -162,7 +162,7 @@ namespace <#= Settings.Namespace #>
 	if (unit.AnyOffsetConversion)
 	{
 	    #>
-			return _conversionFactor * value + _offset;
+			return (value - _offset) / _conversionFactor;
 <#
 	}
 	else
@@ -185,7 +185,7 @@ namespace <#= Settings.Namespace #>
 	if (unit.AnyOffsetConversion)
 	{
 	    #>
-			return (value - _offset) / _conversionFactor;
+			return _conversionFactor * value + _offset;
 <#
 	}
 	else

diff --git a/Gu.Units.Generator/Templates/Unit.txt b/Gu.Units.Generator/Templates/Unit.txt
diff --git a/Gu.Units.Generator/Templates/UnitGenerator.txt b/Gu.Units.Generator/Templates/UnitGenerator.txt
@@ -22,8 +22,6 @@ Read Settings found 8 units
 
 //-> ForceUnit.generated.cs
 
-//-> FractionUnit.generated.cs
-
 //-> FrequencyUnit.generated.cs
 
 //-> InductanceUnit.generated.cs
@@ -52,6 +50,8 @@ Read Settings found 8 units
 
 //-> TorqueUnit.generated.cs
 
+//-> UnitlessUnit.generated.cs
+
 //-> VoltageUnit.generated.cs
 
 //-> VolumetricFlowUnit.generated.cs
@@ -83,7 +83,7 @@ Read Settings found 8 units
 // Gu.Units\Gu.Units\AreaUnit.generated.cs
 // Gu.Units\Gu.Units\LuminousIntensityUnit.generated.cs
 // Gu.Units\Gu.Units\CurrentUnit.generated.cs
-// Gu.Units\Gu.Units\FractionUnit.generated.cs
+// Gu.Units\Gu.Units\UnitlessUnit.generated.cs
 // Gu.Units\Gu.Units\AngleUnit.generated.cs
 // Gu.Units\Gu.Units\TemperatureUnit.generated.cs
 // Gu.Units\Gu.Units\TimeUnit.generated.cs

diff --git a/Gu.Units.Tests/ConversionTests.cs b/Gu.Units.Tests/ConversionTests.cs
@@ -49,16 +49,6 @@ public void Convert(ConversionProvider.IConversion<IQuantity> conversion)
             Assert.AreEqual(conversion.FromQuantity, conversion.ToQuantity);
         }
 
-        [Test, Explicit]
-        public void DegRadFactor()
-        {
-            var d = Math.PI / 180;
-            Console.WriteLine(d.ToString(CultureInfo.InvariantCulture));
-            Console.WriteLine(d.ToString("G17", CultureInfo.InvariantCulture));
-            Console.WriteLine(d.ToString("R", CultureInfo.InvariantCulture));
-            Console.WriteLine((90 * d).ToString("R", CultureInfo.InvariantCulture));
-        }
-
         [TestCaseSource(typeof(UnitsProvider))]
         public void Roundtrip(IUnit unit)
         {

diff --git a/Gu.Units.Tests/Helpers/ConversionProvider.cs b/Gu.Units.Tests/Helpers/ConversionProvider.cs
@@ -17,6 +17,16 @@ public ConversionProvider()
                                             new Conversion<Area>("1.2mm^2","1.2E-6m^2", Area.Parse),
                                             new Conversion<Angle>("90°","1.5707963267948966rad", Angle.Parse),
                                             new Conversion<Angle>("1°","0.017453292519943295rad", Angle.Parse),
+                                            new Conversion<Temperature>("0°C","32°F", Temperature.Parse),
+                                            new Conversion<Temperature>("100°C","211.99999999999994°F", Temperature.Parse),
+                                            new Conversion<Temperature>("100°F","37.777777777777828°C", Temperature.Parse),
+                                            new Conversion<Temperature>("0K","-273.15°C", Temperature.Parse),
+                                            new Conversion<Temperature>("0K","-459.67°F", Temperature.Parse),
+                                            new Conversion<Temperature>("100K","-173.14999999999998°C", Temperature.Parse),
+                                            new Conversion<Temperature>("100K","-279.67°F", Temperature.Parse),
+                                            new Conversion<Unitless>("1ul","100%", Unitless.Parse),
+                                            new Conversion<Unitless>("1%","0.01ul", Unitless.Parse),
+                                            new Conversion<Unitless>("1%","10‰", Unitless.Parse),
                                         };
 
         }

diff --git a/Gu.Units/Gu.Units.csproj b/Gu.Units/Gu.Units.csproj
@@ -124,12 +124,6 @@
     <Compile Include="ForceUnit.generated.cs">
       <DependentUpon>UnitGenerator.txt4</DependentUpon>
     </Compile>
-    <Compile Include="Fraction.generated.cs">
-      <DependentUpon>QuantityGenerator.txt4</DependentUpon>
-    </Compile>
-    <Compile Include="FractionUnit.generated.cs">
-      <DependentUpon>UnitGenerator.txt4</DependentUpon>
-    </Compile>
     <Compile Include="Frequency.generated.cs">
       <DependentUpon>QuantityGenerator.txt4</DependentUpon>
     </Compile>
@@ -217,6 +211,12 @@
     <Compile Include="TorqueUnit.generated.cs">
       <DependentUpon>UnitGenerator.txt4</DependentUpon>
     </Compile>
+    <Compile Include="Unitless.generated.cs">
+      <DependentUpon>QuantityGenerator.txt4</DependentUpon>
+    </Compile>
+    <Compile Include="UnitlessUnit.generated.cs">
+      <DependentUpon>UnitGenerator.txt4</DependentUpon>
+    </Compile>
     <Compile Include="Utils\Parser.cs" />
     <Compile Include="Utils\XmlExt.cs" />
     <Compile Include="Voltage.generated.cs">

diff --git a/Gu.Units/Properties/AssemblyInfo.cs b/Gu.Units/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.0.0")]
-[assembly: AssemblyFileVersion("0.2.0.0")]
+[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyFileVersion("0.2.1.0")]
 [assembly: NeutralResourcesLanguageAttribute("en")]