scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-12-10 06:06:24 +08:00
Code Issues Projects Releases Packages Wiki Activity

made everything more robust, so that if something does break (exception) it reverts back to how it used to calculate

Browse source
This commit is contained in:
Zanz2 2018-07-04 14:45:57 +02:00
parent 6b0d0eeaca
commit 08d72fc7d8
1 changed files with 30 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
vendor/assets/javascripts/ruleJS.js vendored
View file

@ -1036,43 +1036,44 @@ let ruleJS = (function (root) {
switch (type) { switch (type) {
case '+': case '+':
//(sci-2587) MODIFICATION TO AVOID JAVASCRIPT IEEE MANTISSA&EXPONENT FLOATS INNACURACY //(sci-2587) MODIFICATION TO AVOID JAVASCRIPT IEEE MANTISSA&EXPONENT FLOATS INNACURACY
var number1_big = new Big(number1); try{
var result_big = number1_big.plus(number2) var number1_big = new Big(number1);
result = parseFloat(result_big) var result_big = number1_big.plus(number2)
result = parseFloat(result_big)
} catch(e) {
result = number1 + number2
}
//MODIFICATION END //MODIFICATION END
//ORIGINAL: result = number1 + number2; //ORIGINAL: result = number1 + number2;
console.log("plus")
console.log("new: "+result)
console.log("old: "+(number1 + number2))
break; break;
case '-': case '-':
//(sci-2587) MODIFICATION TO AVOID JAVASCRIPT IEEE MANTISSA&EXPONENT FLOATS INNACURACY //(sci-2587) MODIFICATION TO AVOID JAVASCRIPT IEEE MANTISSA&EXPONENT FLOATS INNACURACY
var number1_big = new Big(number1); try{
var result_big = number1_big.minus(number2) var number1_big = new Big(number1);
result = parseFloat(result_big) var result_big = number1_big.minus(number2)
result = parseFloat(result_big)
} catch(e) {
result = number1 - number2
}
//MODIFICATION END //MODIFICATION END
//ORIGINAL: result = number1 - number2; //ORIGINAL: result = number1 - number2;
console.log("minus")
console.log("new: "+result)
console.log("old: "+(number1 - number2))
break; break;
case '/': case '/':
//(sci-2587) MODIFICATION TO AVOID JAVASCRIPT IEEE MANTISSA&EXPONENT FLOATS INNACURACY //(sci-2587) MODIFICATION TO AVOID JAVASCRIPT IEEE MANTISSA&EXPONENT FLOATS INNACURACY
var number1_big = new Big(number1); try{
var result_big = number1_big.div(number2) var number1_big = new Big(number1);
result = parseFloat(result_big) var result_big = number1_big.div(number2)
result = parseFloat(result_big)
} catch(e){
result = number1 / number2
}
//MODIFICATION END //MODIFICATION END
//ORIGINAL: result = number1 / number2; //ORIGINAL: result = number1 / number2;
console.log("div")
console.log("new: "+result)
console.log("old: "+(number1 / number2))
if (result == Infinity) { if (result == Infinity) {
throw Error('DIV_ZERO'); throw Error('DIV_ZERO');
} else if (isNaN(result)) { } else if (isNaN(result)) {
@ -1082,45 +1083,24 @@ let ruleJS = (function (root) {
case '*': case '*':
//(sci-2587) MODIFICATION TO AVOID JAVASCRIPT IEEE MANTISSA&EXPONENT FLOATS INNACURACY //(sci-2587) MODIFICATION TO AVOID JAVASCRIPT IEEE MANTISSA&EXPONENT FLOATS INNACURACY
var number1_big = new Big(number1); try{
var result_big = number1_big.times(number2) var number1_big = new Big(number1);
result = parseFloat(result_big) var result_big = number1_big.times(number2)
result = parseFloat(result_big)
} catch(e) {
result = number1 * number2
}
//MODIFICATION END //MODIFICATION END
//ORIGINAL: result = number1 * number2; //ORIGINAL: result = number1 * number2;
console.log("mult")
console.log("new: "+result)
console.log("old: "+(number1 * number2))
break; break;
case '^': case '^':
//(sci-2587) MODIFICATION TO AVOID JAVASCRIPT IEEE MANTISSA&EXPONENT FLOATS INNACURACY result = Math.pow(number1, number2);
var number1_big = new Big(number1);
var result_big = number1_big.pow(number2)
result = parseFloat(result_big)
//MODIFICATION END
//ORIGINAL: result = Math.pow(number1, number2);
var old_res = Math.pow(number1, number2)
console.log("----------------problem------------")
console.log("--power")
console.log("new: "+result)
console.log("old: "+old_res)
break; break;
case 'e': case 'e':
//(sci-2587) MODIFICATION TO AVOID JAVASCRIPT IEEE MANTISSA&EXPONENT FLOATS INNACURACY result = number1 * Math.pow(10, number2);
var number1_big = new Big(number1);
var second_part = new Big(10).pow(number2);
var result_big = number1_big.times(ParseFloat(second_part))
result = parseFloat(result_big)
//MODIFICATION END
//ORIGINAL: result = number1 * Math.pow(10, number2);
var old_res = number1 * Math.pow(10, number2)
console.log("----------------problem------------")
console.log("--e")
console.log("new: "+result)
console.log("old: "+old_res)
break; break;
} }