Merge lp:~rpadovani/ubuntu-calculator-app/1232058 into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Riccardo Padovani]

Update engine to better precision:
- now can continue also exponetial calc
- now also decimal result has a limit

Fixed #1232058

Update engine to better precision:
- now can continue also exponetial calc
- now also decimal result has a limit

Fixed #1232058

[Mihir Soni (mihirsoni)]

Works great :)

Thanks a lot for your time :)

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'Simple/SimplePage.qml'
--- Simple/SimplePage.qml	2013-09-27 06:21:23 +0000
+++ Simple/SimplePage.qml	2013-09-28 09:32:08 +0000
@@ -86,6 +86,10 @@
             calculate();
         }
         formulaView.headerItem.state = "calculationCompleted";
+        // We modify result here to have max precision in the calc, but to have a limited number of decimal displayed
+        // .replace is to avoid to write final 0 in simple calc, because toPrecision add 0
+        // CALC.PRECISION is set in engine.js
+        result = result.toPrecision(CALC.PRECISION).replace(/\.0+$/,"")
         screenFormula.push({_text:'', _operation: '=', _number: result.toString()});
         formulaView.currentOperatorsChanged();
     }

=== modified file 'engine.js'
--- engine.js	2013-09-10 15:25:42 +0000
+++ engine.js	2013-09-28 09:32:08 +0000
@@ -23,9 +23,7 @@
 
 // ----------------------------------------
 // constants (const keyword is not working)
-var MAX_DECIMAL = 5; // Number of maximum decimal positions
 var PRECISION = 8 // Max lenght of result in exponential mode
-var MAX_LENGHT = 100000000000 // Highest number before exponential mode
 
 var RAD = 0, DEG = 1, GRAD = 2; //Trigonometric functions
 
@@ -550,30 +548,30 @@
             switch (type) {
             case T_PLUS:
                 result = lhs.value.plus(rhs.value);
-                return result > MAX_LENGHT ? result.toPrecision(PRECISION) : result;
+                return result;
 
             case T_MINUS:
                 result = lhs.value.minus(rhs.value);
-                return result > MAX_LENGHT ? result.toPrecision(PRECISION) : result;
+                return result;
 
             case T_TIMES:
                 result = lhs.value.times(rhs.value);
-                return result > MAX_LENGHT ? result.toPrecision(PRECISION) : result;
+                return result;
 
             case T_DIV:
                 result = lhs.value.div(rhs.value);
-                return result > MAX_LENGHT ? result.toPrecision(PRECISION) : result;
+                return result;
 
             case T_MOD:
                 if (rhs.value === 0.)
                     throw new DivisionByZeroError('modulo division by zero');
 
                 result = lhs.value.mod(rhs.value);
-                return result > MAX_LENGHT ? result.toPrecision(PRECISION) : result;
+                return result;
 
             case T_POW:
                 result = lhs.value.pow(rhs.value);
-                return result > MAX_LENGHT ? result.toPrecision(PRECISION) : result;
+                return result;
             }
 
             // throw?