[calculation/additonal_results] Display scientific notation for negat…

…ive integers
numworks · Mar 25, 2024 · ea18e8a · ea18e8a
1 parent fd16cf5
commit ea18e8a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/apps/calculation/additional_results/additional_results_type.cpp b/apps/calculation/additional_results/additional_results_type.cpp
@@ -262,7 +262,8 @@ bool AdditionalResultsType::HasScientificNotation(
       calculationPreferences.numberOfSignificantDigits, globalContext);
   return !historyResult.isIdenticalTo(
       ScientificNotationHelper::ScientificLayout(
-          approximateOutput, globalContext, calculationPreferences));
+          approximateOutput, globalContext, calculationPreferences),
+      true);
 }
 
 bool AdditionalResultsType::HasInteger(const Expression exactOutput) {

diff --git a/apps/calculation/additional_results/scientific_notation_helper.cpp b/apps/calculation/additional_results/scientific_notation_helper.cpp
@@ -15,7 +15,9 @@ Layout ScientificLayout(
   assert(calculationPreferences.displayMode !=
          Preferences::PrintFloatMode::Scientific);
   Expression e;
-  if (a.type() == ExpressionNode::Type::BasedInteger) {
+  if (a.type() == ExpressionNode::Type::BasedInteger ||
+      (a.type() == ExpressionNode::Type::Opposite &&
+       a.childAtIndex(0).type() == ExpressionNode::Type::BasedInteger)) {
     // Based Integer must be approximated to be layouted in scientific mode
     ApproximationContext approximationContext(context);
     e = Float<double>::Builder(

diff --git a/apps/calculation/test/calculation_store.cpp b/apps/calculation/test/calculation_store.cpp
@@ -931,5 +931,6 @@ QUIZ_CASE(calculation_additional_results) {
                                            &globalContext, &store);
   assertCalculationAdditionalResultTypeHas("[[1+2i][3+i]]", {.matrix = true},
                                            &globalContext, &store);
-  assertCalculationAdditionalResultTypeHas("-10", {}, &globalContext, &store);
+  assertCalculationAdditionalResultTypeHas("-10", {.scientificNotation = true},
+                                           &globalContext, &store);
 }