Added relative numbers to copy cmd

Added additional unit tests to check this
Useful for UDFs or when the number of items on the stack is unknown

Author: frossm

.idea/jarRepositories.xml

@@ -3,7 +3,7 @@
 
 	<groupId>org.fross</groupId>
 	<artifactId>rpncalc</artifactId>
-	<version>5.4.1</version>
+	<version>5.5.0</version>
 	<packaging>jar</packaging>
 
 	<name>rpncalc</name>
@@ -279,15 +279,15 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.11.4</version>
+			<version>5.12.0-RC1</version>
 			<scope>test</scope>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.jline/jline-reader -->
 		<dependency>
 			<groupId>org.jline</groupId>
 			<artifactId>jline</artifactId>
-			<version>3.28.0</version>
+			<version>3.29.0</version>
 		</dependency>
 
 	</dependencies>

mdbook/src/Chapters/CalculatorCommands.md

@@ -1,5 +1,5 @@
 name: rpncalc
-version: '5.4.1'
+version: '5.5.0'
 summary: The command line Reverse Polish Notation (RPN) calculator
 description: |
   RPNCalc is an easy to use command line based Reverse Polish

pom.xml

@@ -135,8 +135,7 @@ public static void cmdAverage(StackObj calcStack, String arg) {
       BigDecimal mean = Math.mean(calcStack);
 
       // If we are not going to keep the stack (the default) clear it
-      if (!keepFlag)
-         calcStack.clear();
+      if (!keepFlag) calcStack.clear();
 
       // Add the average to the stack
       calcStack.push(mean);
@@ -182,14 +181,26 @@ public static void cmdCopy(StackObj calcStack, String arg) {
          return;
       }
 
-      // Determine line number to copy
+      // If Arg is blank, set arg to the top of the stack number so we copy the last value
+      if (arg.isBlank()) arg = "1";
+
+      // Determine if the provided argument is not a number
+      if (!Math.isNumeric(arg)) {
+         Output.printColorln(Ansi.Color.RED, "ERROR:  '" + arg + "' is not a valid line number");
+         return;
+      }
+
       try {
+         // Grab the value from the argument
          lineNumToCopy = Integer.parseInt(arg);
-      } catch (NumberFormatException ex) {
-         if (!arg.isBlank()) {
-            Output.printColorln(Ansi.Color.RED, "ERROR:  '" + arg + "' is not a valid line number");
-            return;
+
+         // If a relative number is provided (i.e. `-1`) then set the value to copy back from the top of the stack
+         if (lineNumToCopy <= -1) {
+            lineNumToCopy = java.lang.Math.abs(lineNumToCopy);    // Remove the negative sign
+            lineNumToCopy = 1 + lineNumToCopy;
          }
+      } catch (Exception ex) {
+         Output.printColorln(Ansi.Color.RED, "ERROR:  '" + arg + "' is not a valid relative value");
       }
 
       // Save current calcStack to the undoStack
@@ -200,14 +211,14 @@ public static void cmdCopy(StackObj calcStack, String arg) {
       // Copy the provided number if it's valid
       try {
          // Ensure the number entered is valid
-         if (lineNumToCopy < 1 || lineNumToCopy > calcStack.size()) {
-            Output.printColorln(Ansi.Color.RED, "Invalid line number entered: " + lineNumToCopy);
+         if (lineNumToCopy > calcStack.size()) {
+            Output.printColorln(Ansi.Color.RED, "Invalid line number entered");
          } else {
             // Perform the copy
             calcStack.push(calcStack.get(calcStack.size() - lineNumToCopy));
          }
       } catch (Exception e) {
-         Output.printColorln(Ansi.Color.RED, "Error parsing line number for element copy: '" + lineNumToCopy + "'");
+         Output.printColorln(Ansi.Color.RED, "Error parsing line number for copy: '" + lineNumToCopy + "'");
          Output.debugPrintln(e.getMessage());
       }
    }
@@ -479,13 +490,12 @@ public static void cmdLinearRegression(StackObj calcStack, String args) {
          sumY2 = sumY2.add(new BigDecimal(String.valueOf(y)).pow(2));
 
          // Line by line debug output
-         Output.debugPrintln(
-               "#" + i + ":\tx:" + x + "\ty:" + y + "\tXY:" + y.multiply(new BigDecimal(String.valueOf(x))) + "\tX2:" + (x * x) + "\tY2:" + y.pow(2));
+         Output.debugPrintln("#" + i + ":\tx:" + x + "\ty:" + y + "\tXY:" + y.multiply(new BigDecimal(String.valueOf(x))) + "\tX2:" + (x * x) + "\tY2:" + y.pow(2));
       }
 
-		// Calculate the remaining values
-		// Reference Formula:  a = ((sumY * sumX2) - (sumX * sumXY)) / ((n * sumX2) - (sumX * sumX));
-		// Reference Formula:  b = ((n * sumXY) - (sumX * sumY)) / ((n * sumX2) - (sumX * sumX));
+      // Calculate the remaining values
+      // Reference Formula:  a = ((sumY * sumX2) - (sumX * sumXY)) / ((n * sumX2) - (sumX * sumX));
+      // Reference Formula:  b = ((n * sumXY) - (sumX * sumY)) / ((n * sumX2) - (sumX * sumX));
 
       BigDecimal a_top = sumY.multiply(sumX2).subtract(sumX.multiply(sumXY));
       BigDecimal a_bottom = n.multiply(sumX2).subtract(sumX.pow(2));
@@ -583,8 +593,7 @@ public static boolean cmdMaximum(StackObj calcStack) {
 
       // Loop through the stack and look for the largest value
       for (int i = 0; i < calcStack.size(); i++) {
-         if (calcStack.get(i).compareTo(largestValue) > 0)
-            largestValue = calcStack.get(i);
+         if (calcStack.get(i).compareTo(largestValue) > 0) largestValue = calcStack.get(i);
       }
 
       // Add the lowest value to the stack
@@ -626,8 +635,7 @@ public static void cmdMedian(StackObj calcStack, String arg) {
       BigDecimal median = Math.median(calcStack);
 
       // If we are not going to keep the stack (the default) clear it
-      if (!keepFlag)
-         calcStack.clear();
+      if (!keepFlag) calcStack.clear();
 
       // Add the average to the stack
       calcStack.push(median);
@@ -654,8 +662,7 @@ public static boolean cmdMinimum(StackObj calcStack) {
 
       // Loop through the stack and look for the lowest value
       for (int i = 0; i < calcStack.size(); i++) {
-         if (calcStack.get(i).compareTo(lowestValue) < 1)
-            lowestValue = calcStack.get(i);
+         if (calcStack.get(i).compareTo(lowestValue) < 1) lowestValue = calcStack.get(i);
       }
 
       // Add the lowest value to the stack

snap/snapcraft.yaml

@@ -232,6 +232,33 @@ void testCmdCopy() {
       assertEquals("123E+42", stk.peek().toEngineeringString());
       assertEquals("123E+42", stk.get(stk.size() - 1).toEngineeringString());
       assertEquals(1.23, stk.get(0).doubleValue());
+
+      // Test relative copy
+      stk.clear();
+      stk.push(1);
+      stk.push(2);
+      stk.push(3);
+      stk.push(4);
+      stk.push(5);
+      StackCommands.cmdCopy(stk, "-3");
+      assertEquals(6, stk.size());
+      assertEquals("2", stk.pop().toString());
+
+      StackCommands.cmdCopy(stk, "-1");
+      assertEquals(6, stk.size());
+      assertEquals("4", stk.pop().toString());
+
+      StackCommands.cmdCopy(stk, "-4");
+      assertEquals(6, stk.size());
+      assertEquals("1", stk.pop().toString());
+
+      StackCommands.cmdCopy(stk, "-5");
+      assertEquals(5, stk.size());
+      assertEquals("4", stk.get(stk.size() - 2).toString());
+
+      StackCommands.cmdCopy(stk, "err");
+      assertEquals(5, stk.size());
+      assertEquals("4", stk.get(stk.size() - 2).toString());
    }
 
    /**