diff --git a/mdbook/src/Chapters/Conversions.md b/mdbook/src/Chapters/Conversions.md index 7fbd25f..77bb2d9 100644 --- a/mdbook/src/Chapters/Conversions.md +++ b/mdbook/src/Chapters/Conversions.md @@ -28,7 +28,7 @@ if `frac 5` would have been entered (which means 1/5 is maximum granularity), yo | ft2in | Converts the value in `line1` from feet to inches | | deg2rad | Convert `line1` from degrees into [radians](https://en.wikipedia.org/wiki/Radian) | | rad2deg | Convert `line1` from radians into degrees | -| gram2oz
grams2oz | Convert `line1` from grams into ounces using the constant of 0.035274 ounces / gram | -| oz2gram
oz2grams | Convert `line1` from ounces into grams using the constant of 28.349523125 grams / ounce | -| kg2lbs
kgs2lbs | convert `line1` from kilograms to US pounds using the constant of 2.2046226218 lbs/kg | -| lbs2kg
lbs2kgs | convert `line1` from US pounds using the constant of 0.45359237 kg/lbs | +| gram2oz | Convert `line1` from grams into ounces using the constant of 0.035274 ounces / gram | +| oz2gram | Convert `line1` from ounces into grams using the constant of 28.349523125 grams / ounce | +| kg2lb | convert `line1` from kilograms to US pounds using the constant of 2.2046226218 lbs/kg | +| lb2kg | convert `line1` from US pounds using the constant of 0.45359237 kg/lbs | diff --git a/pom.xml b/pom.xml index 0f69f31..1e26729 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.fross rpncalc - 5.3.1 + 5.3.2 jar rpncalc diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 5b1528f..c84c938 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: rpncalc -version: '5.3.1' +version: '5.3.2' summary: The command line Reverse Polish Notation (RPN) calculator description: | RPNCalc is an easy to use command line based Reverse Polish diff --git a/src/main/java/org/fross/rpncalc/CommandParser.java b/src/main/java/org/fross/rpncalc/CommandParser.java index 274e6cb..7ac72bd 100644 --- a/src/main/java/org/fross/rpncalc/CommandParser.java +++ b/src/main/java/org/fross/rpncalc/CommandParser.java @@ -252,26 +252,22 @@ public static void Parse(StackObj calcStack, StackObj calcStack2, String cmdInpu // Convert grams to ounces case "gram2oz": - case "grams2oz": StackConversions.cmdGram2Oz(calcStack); break; // Convert ounces to grams case "oz2gram": - case "oz2grams": StackConversions.cmdOz2Gram(calcStack); break; // Convert Kilograms to US Pounds - case "kg2lbs": - case "kgs2lbs": - StackConversions.cmdKg2Lbs(calcStack); + case "kg2lb": + StackConversions.cmdKg2Lb(calcStack); break; // Convert US Pounds to Kilograms - case "lbs2kg": - case "lbs2kgs": - StackConversions.cmdLbs2Kg(calcStack); + case "lb2kg": + StackConversions.cmdLb2Kg(calcStack); break; /*------------------------------------------------------------------------------ diff --git a/src/main/java/org/fross/rpncalc/Help.java b/src/main/java/org/fross/rpncalc/Help.java index e88002e..2ae00b4 100644 --- a/src/main/java/org/fross/rpncalc/Help.java +++ b/src/main/java/org/fross/rpncalc/Help.java @@ -108,8 +108,8 @@ public static void Display() { Output.printColorln(Ansi.Color.WHITE, " ft2in Convert line1 from feet to inches"); Output.printColorln(Ansi.Color.WHITE, " gram2oz Convert line1 from grams to US ounces"); Output.printColorln(Ansi.Color.WHITE, " oz2gram Convert line1 from US ounces to grams"); - Output.printColorln(Ansi.Color.WHITE, " kg2lbs Convert line1 from kilograms to US pounds"); - Output.printColorln(Ansi.Color.WHITE, " lbs2kg Convert line1 from US pounds to kilograms"); + Output.printColorln(Ansi.Color.WHITE, " kg2lb Convert line1 from kilograms to US pounds"); + Output.printColorln(Ansi.Color.WHITE, " lb2kg Convert line1 from US pounds to kilograms"); Output.printColorln(Ansi.Color.YELLOW, "\nTrigonometry Functions:"); Output.printColorln(Ansi.Color.WHITE, " sin|cos|tan [rad] Trig Functions: Angle is in degrees unless rad is provided"); diff --git a/src/main/java/org/fross/rpncalc/StackConversions.java b/src/main/java/org/fross/rpncalc/StackConversions.java index ab0ded3..09a5540 100644 --- a/src/main/java/org/fross/rpncalc/StackConversions.java +++ b/src/main/java/org/fross/rpncalc/StackConversions.java @@ -320,7 +320,7 @@ public static void cmdOz2Gram(StackObj calcStack) { * * @param calcStack Primary Stack */ - public static void cmdKg2Lbs(StackObj calcStack) { + public static void cmdKg2Lb(StackObj calcStack) { // Ensure we have something on the stack if (calcStack.isEmpty()) { Output.printColorln(Ansi.Color.RED, "ERROR: There are no items on the stack."); @@ -340,7 +340,7 @@ public static void cmdKg2Lbs(StackObj calcStack) { * * @param calcStack Primary Stack */ - public static void cmdLbs2Kg(StackObj calcStack) { + public static void cmdLb2Kg(StackObj calcStack) { // Ensure we have something on the stack if (calcStack.isEmpty()) { Output.printColorln(Ansi.Color.RED, "ERROR: There are no items on the stack."); diff --git a/src/test/java/org/fross/rpncalc/StackConversionsTest.java b/src/test/java/org/fross/rpncalc/StackConversionsTest.java index 810638a..02460f1 100644 --- a/src/test/java/org/fross/rpncalc/StackConversionsTest.java +++ b/src/test/java/org/fross/rpncalc/StackConversionsTest.java @@ -455,21 +455,21 @@ void testOz2Gram() { * Test Kilograms to US pounds conversion */ @Test - void testKg2Lbs() { + void testKg2Lb() { StackObj stk = new StackObj(); stk.push(123.321); - StackConversions.cmdKg2Lbs(stk); + StackConversions.cmdKg2Lb(stk); StackCommands.cmdRound(stk, "5"); assertEquals(271.87627, stk.pop().doubleValue()); stk.push(-0.369); - StackConversions.cmdKg2Lbs(stk); + StackConversions.cmdKg2Lb(stk); StackCommands.cmdRound(stk, "5"); assertEquals(-0.81351, stk.pop().doubleValue()); stk.push(4.321e18); - StackConversions.cmdKg2Lbs(stk); + StackConversions.cmdKg2Lb(stk); StackCommands.cmdRound(stk, "2"); assertEquals("9526174348797800000.00", stk.pop().toEngineeringString()); @@ -479,21 +479,21 @@ void testKg2Lbs() { * Test US Pounds to Kilograms conversion */ @Test - void testLbs2Kg() { + void testLb2Kg() { StackObj stk = new StackObj(); stk.push(456.654); - StackConversions.cmdLbs2Kg(stk); + StackConversions.cmdLb2Kg(stk); StackCommands.cmdRound(stk, "5"); assertEquals(207.13477, stk.pop().doubleValue()); stk.push(-0.987654); - StackConversions.cmdLbs2Kg(stk); + StackConversions.cmdLb2Kg(stk); StackCommands.cmdRound(stk, "5"); assertEquals(-0.44799, stk.pop().doubleValue()); stk.push(4.321e18); - StackConversions.cmdLbs2Kg(stk); + StackConversions.cmdLb2Kg(stk); StackCommands.cmdRound(stk, "2"); assertEquals("1959972630770000000.00", stk.pop().toEngineeringString()); }