Merge pull request #2 from randyheaton/master

new equal
Doenet · Jul 29, 2015 · 72ca6e5 · 72ca6e5
2 parents 0b1375a + 1cb46cb
commit 72ca6e5
Show file tree

Hide file tree

Showing 12 changed files with 7,567 additions and 45 deletions.
diff --git a/lib/ast-to-complex-function.js b/lib/ast-to-complex-function.js
@@ -49,7 +49,7 @@ var complex_math_functions = {
     "gamma": function(operands) { return operands[0].gamma(); },
 
     "^": function(operands) { return operands[0].power(operands[1]); },
-    "abs": function(operands) { return new ComplexNumber( operands[0].modulus(), 0 ); },
+    "abs": function(operands) {return operands[0].power(new ComplexNumber(2,0)).log().multiply(new ComplexNumber(.5,0)).exp();},
     "apply": function(operands) { return NaN; },
 };