Merge lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-round-fix into lp:ubuntu-calculator-app

[Bartosz Kosiorek]

Enable BigNumber to resolve issues with rounding floating point numbers

Enable BigNumber to resolve issues with rounding floating point numbers

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

PASSED: Continuous integration, rev:167
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/305/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2624
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2624/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/84
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/27

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/305/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Great work Bartosz, thanks for working on this and finally find a way to enable that :-)

But there is an improvement to do: we need to truncate numbers when they are too long. Try to do 1/3 here and in trunk: you see there it will occupy too much space in the history!

review: Needs Fixing

[Bartosz Kosiorek (gang65)]

Thanks Riccardo.
Changing to BigNumber do not causing longer numbers.

Truncating numbers will not help with all cases: for example long formula.
My idea was to use few lines to display history: If formula is short then we will display it in one row, if not we will use few rows.

I will create bug report regarding to that.
I think we need analyse possible solutions, and select one which fit our need the best.

review: Needs Information

[Bartosz Kosiorek (gang65)]

Bug report created:
https://bugs.launchpad.net/ubuntu-calculator-app/+bug/1446808

[Bartosz Kosiorek (gang65)]

@Riccardo
You have right the length of the infinity numbers was increased dramatically.
I will try to fix that.

[lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-round-fix]

168. By Bartosz Kosiorek on 2015-04-24

Change default BigNumber precision from 64 to 16

169. By Bartosz Kosiorek on 2015-04-24

Format calculation result

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

PASSED: Continuous integration, rev:169
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/308/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2640
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2640/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/87
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/30

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/308/rebuild

review: Approve (continuous-integration)

[lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-round-fix]

170. By Bartosz Kosiorek on 2015-04-24

Add autopilot test to operate on big numbers

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

FAILED: Continuous integration, rev:170
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/309/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2641/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/88/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/31/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/309/rebuild

review: Needs Fixing (continuous-integration)

[lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-round-fix]

171. By Bartosz Kosiorek on 2015-04-24

Fix pep8 warnings

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

FAILED: Continuous integration, rev:171
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/310/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2642
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2642/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/89
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/32

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/310/rebuild

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml	2015-04-06 12:49:36 +0000
+++ app/ubuntu-calculator-app.qml	2015-04-24 19:58:34 +0000
@@ -102,6 +102,10 @@
     }
 
     function formulaPush(visual) {
+        mathJs.config({
+                number: 'bignumber',  // Choose 'number' (default) or 'bignumber'
+                precision: 64
+        });
         // If the user press a number after the press of "=" we start a new
         // formula, otherwise we continue with the old one
         if (!isNaN(visual) && isLastCalculate) {
@@ -160,6 +164,10 @@
     }
 
     function calculate() {
+        mathJs.config({
+                number: 'bignumber',  // Choose 'number' (default) or 'bignumber'
+                precision: 64
+        });
         if ((longFormula === '') || (isLastCalculate === true)) {
             errorAnimation.restart();
             return;
@@ -175,6 +183,21 @@
 
         try {
             var result = mathJs.eval(longFormula);
+
+            // Maximum length of the result number
+            var NUMBER_LENGTH_LIMIT = 12;
+
+            if (mathJs.format(result).toString().length > NUMBER_LENGTH_LIMIT) {
+                if (result.toExponential().toString().length > NUMBER_LENGTH_LIMIT) {
+                    // long format like: "1.2341322e+22"
+                    result = mathJs.format(result, {notation: 'auto', precision: NUMBER_LENGTH_LIMIT});
+                } else {
+                    // short format like: "1e-10"
+                    result = result.toExponential();
+                }
+            } else {
+                result = mathJs.format(result)
+            }
         } catch(exception) {
             // If the formula isn't right and we added brackets, we remove them
             for (var i = 0; i < numberOfOpenedBrackets; i++) {
@@ -205,6 +228,7 @@
         id: mainStack
 
         Component.onCompleted: {
+
             push(calculatorPage);
             calculatorPage.forceActiveFocus();
         }

=== modified file 'tests/autopilot/ubuntu_calculator_app/tests/test_main.py'
--- tests/autopilot/ubuntu_calculator_app/tests/test_main.py	2015-03-26 21:16:14 +0000
+++ tests/autopilot/ubuntu_calculator_app/tests/test_main.py	2015-04-24 19:58:34 +0000
@@ -105,6 +105,18 @@
         self._assert_result_is(u'1e−10')
         self._assert_history_contains(u'0.000000001÷10=1e−10')
 
+    def test_operation_on_large_numbers(self):
+        self.app.main_view.insert('99999999999*99999999999=')
+        self._assert_result_is(u'9.9999999998e+21')
+        self._assert_history_contains(u'99999999999×99999999999='
+                                      '9.9999999998e+21')
+
+        self.app.main_view.insert('*100=')
+
+        self._assert_result_is(u'9.9999999998e+23')
+        self._assert_history_contains(u'9.9999999998e+21×100='
+                                      '9.9999999998e+23')
+
     def test_brackets_precedence(self):
         self.app.main_view.insert('2*')
         self.app.main_view.press_universal_bracket()
@@ -169,16 +181,16 @@
 
     def test_divide_with_infinite_number_as_result(self):
         self.app.main_view.insert('1/3=')
-        self._assert_result_is(u'0.3333333333333333')
-        self._assert_history_contains(u'1÷3=0.3333333333333333')
+        self._assert_result_is(u'0.333333333333')
+        self._assert_history_contains(u'1÷3=0.333333333333')
 
     def test_operation_on_infinite_number(self):
         self.app.main_view.insert('5/3=')
-        self._assert_result_is(u'1.6666666666666667')
-        self._assert_history_contains(u'5÷3=1.6666666666666667')
+        self._assert_result_is(u'1.666666666667')
+        self._assert_history_contains(u'5÷3=1.666666666667')
 
         self.app.main_view.insert('-1=')
-        self._assert_result_is(u'0.6666666666666667')
+        self._assert_result_is(u'0.666666666667')
 
     def test_square(self):
         self.app.main_view.insert('4')
@@ -289,6 +301,11 @@
         self._assert_result_is(u'−66')
         self._assert_history_contains(u'66i×i=−66')
 
+    def test_floating_point_round_error(self):
+        self.app.main_view.insert('0.1+0.2=')
+        self._assert_result_is(u'0.3')
+        self._assert_history_contains(u'0.1+0.2=0.3')
+
     def _assert_result_is(self, value):
         self.assertThat(self.app.main_view.get_result,
                         Eventually(Equals(value)))