From 401a3ecbc8f827d75cdfd0c48df841904babd7a6 Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 19 Mar 2025 13:10:31 -0400 Subject: [PATCH] canonical unit names must be singular! fixes #34 --- Conversion/Converter.cs | 7 ++++--- assets/conversion.json | 13 ++++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Conversion/Converter.cs b/Conversion/Converter.cs index e18d377..c6fb706 100644 --- a/Conversion/Converter.cs +++ b/Conversion/Converter.cs @@ -127,6 +127,7 @@ namespace vassago.Conversion return $"{String.Format("{0:N}", accumulator)} {normalizedDestUnit}"; } } + return "you can never read this."; } return "dimensional analysis failure - I know those units but can't find a path between them."; } @@ -170,9 +171,9 @@ namespace vassago.Conversion { if (conv.Item1 == last && currentPath.Contains(conv.Item2) == false && conv.Item3 != null) { - var test = exhaustiveBreadthFirst(dest, currentPath.Append(conv.Item2)); - if (test != null) - return test; + var test = exhaustiveBreadthFirst(dest, currentPath.Append(conv.Item2)); + if (test != null) + return test; } if (conv.Item2 == last && currentPath.Contains(conv.Item1) == false && conv.Item4 != null) { diff --git a/assets/conversion.json b/assets/conversion.json index 8674586..043a238 100644 --- a/assets/conversion.json +++ b/assets/conversion.json @@ -219,16 +219,16 @@ ] }, { - "canonical":"blue whale lengths", + "canonical":"blue whale length", "aliases": [ "bwl", "whales" ] }, { - "canonical":"ångströms", + "canonical":"ångström", "aliases": [ - "angstroms", + "angstrom", "Å" ] }, @@ -239,6 +239,12 @@ "micrometres", "microns" ] + }, + { + "canonical":"uncle jordan", + "aliases":[ + "uj" + ] } ], "linearPairs":[ @@ -267,6 +273,7 @@ {"item1":"blue whale length", "item2": "m", "factor": 29.9}, {"item1":"m", "item2": "ångström", "factor": 10000000000}, {"item1":"smoot", "item2": "ft", "factor": 5.583333333333}, + {"item1":"uncle jordan", "item2": "cm", "factor":192.405}, {"item1":"floz", "item2":"mL", "factor":29.57344}, {"item1":"L", "item2":"mL", "factor":1000},