Merge pull request aerospaceresearch#220 from aerospaceresearch/dev

Final PR for Google Summer of Code 2019

Author: notimeforcaution

main.py

@@ -36,7 +36,6 @@ class VisMa_Prompt(Cmd):
         prompt = '>>> '
         intro = "Welcome! This is Visual Maths Interactive Shell...\n" + "type 'help' for a User Manual and Ctrl + D to Exit prompt\n"
 
-        @classmethod
         def do_exit(self, inp):
             '''Exits VisMa Prompt'''
             print("Exiting VisMa...")
@@ -51,14 +50,12 @@ def do_manual(self, inp):
             '''Displays a list of commands that can be used'''
             print(self.userManual)
 
-        @classmethod
         def do_gui(self, inp):
             '''Starts GUI of VisMa'''
             initGUI()
             print("Initiating GUI...")
             logger.info("Initiating GUI...")
 
-        @classmethod
         def default(self, inp):
             '''Directs to CommandExec and performs operations thereafter'''
             try:

setup.py

@@ -6,7 +6,7 @@
 setuptools.setup(
     name="VISualMAth",
     description="visma - VISual MAth : A math equation solver and visualizer",
-    version="0.2.2",
+    version="0.2.3",
     author="Siddharth Kothiyal, Shantanu Mishra",
     author_email="[email protected], [email protected]",
     long_description=long_description,

tests/test_calculus.py

@@ -1,4 +1,4 @@
-from visma.calculus.differentiation import differentiate
+from visma.calculus.differentiation import differentiate, differentiationProductRule
 from visma.calculus.integration import integrate
 from tests.tester import quickTest
 
@@ -9,29 +9,71 @@
 
 def test_differentiate():
 
-    assert quickTest("x^2 + x", differentiate, 'x') == "2.0x+1"
+    assert quickTest("x^2 + x", differentiate, 'x') == "2.0x+1.0"
 
-    assert quickTest("x + 2y + 3z + 4", differentiate, 'x') == "1"
-    # FIXME(tokensToString error): assert quickTest("x + 2y + 3z + 4", differentiate, 'y') == "2"
-    # FIXME(tokensToString error): assert quickTest("x + 2y + 3z + 4", differentiate, 'z') == "3"
+    assert quickTest("x + 2y + 3z + 4", differentiate, 'x') == "1.0"
+    assert quickTest("x + 2y + 3z + 4", differentiate, 'y') == "2.0"
+    assert quickTest("x + 2y + 3z + 4", differentiate, 'z') == "3.0"
 
     assert quickTest("xy + xy^2 + xyz", differentiate, 'x') == "y+y^(2.0)+yz"
     assert quickTest("xy + xy^2 + xyz", differentiate, 'y') == "x+2.0xy+xz"
-    assert quickTest("xy + xy^2 + xyz", differentiate, 'z') == "+xy"  # FIXME: Remove unnecessary sign '+'
+    assert quickTest("xy + xy^2 + xyz", differentiate, 'z') == "xy"
+
+    assert quickTest("xy + z", differentiate, 'z') == "1.0"
+    assert quickTest("z + xy", differentiate, 'z') == "1.0"
+    assert quickTest("z - xy", differentiate, 'z') == "1.0"
+    assert quickTest("xy - z", differentiate, 'z') == "-1.0"
+
+    assert quickTest("sin(x)", differentiate, 'x') == "cos(x)*1.0"
+    assert quickTest("sin(x)", differentiate, 'y') == "0.0"
+    assert quickTest("sin(xxx)", differentiate, 'x') == "cos(x^(3.0))*3.0x^(2.0)"
+    assert quickTest("sin(log(xx))", differentiate, 'x') == "cos(log(x^(2.0)))*x^(-1.0)*2.0x"
+
+    assert quickTest("cos(x)", differentiate, 'x') == "-1.0*sin(x)*1.0"
+    assert quickTest("cos(x)", differentiate, 'y') == "0.0"
+    assert quickTest("cos(xxx)", differentiate, 'x') == "-1.0*sin(x^(3.0))*3.0x^(2.0)"
+    assert quickTest("cos(log(xx))", differentiate, 'x') == "-1.0*sin(log(x^(2.0)))*x^(-1.0)*2.0x"
+
+    assert quickTest("tan(x)", differentiate, 'x') == "sec(x)*1.0"
+    # FIXME: Simplify module simplifies sec^2(x) as sec(x) and cosec^2(x) as cosec(x), however differentiation modules give correct output
+    assert quickTest("tan(x)", differentiate, 'y') == "0.0"
+
+    assert quickTest("cot(x)", differentiate, 'x') == "-1.0*csc(x)*1.0"
+    # FIXME: Simplify module simplifies sec^2(x) as sec(x) and cosec^2(x) as cosec(x), however differentiation modules give correct output
+    assert quickTest("cot(x)", differentiate, 'y') == "0.0"
+
+    assert quickTest("csc(x)", differentiate, 'x') == "-1.0*csc(x)*cot(x)*1.0"
+    assert quickTest("csc(x)", differentiate, 'y') == "0.0"
+
+    assert quickTest("sec(x)", differentiate, 'x') == "sec(x)*tan(x)*1.0"
+    assert quickTest("sec(x)", differentiate, 'y') == "0.0"
+
+    assert quickTest("log(x)", differentiate, 'x') == "x^(-1.0)"
+    assert quickTest("log(xx)", differentiate, 'x') == "2.0"
+
+    # Tests for Product Rule of Differentiation.
+    assert quickTest("sin(x)*cos(x)", differentiationProductRule, 'x') == "(cos(x)*1.0)*cos(x)+sin(x)*(-1.0*sin(x)*1.0)"
+    assert quickTest("sin(x)*x", differentiationProductRule, 'x') == "(cos(x)*1.0)*x+sin(x)*(1.0)"
+    assert quickTest("sin(x)*y", differentiationProductRule, 'x') == "(cos(x)*1.0)*y+sin(x)*(0.0)"
+    assert quickTest("sin(x)*cos(x)*sec(x)", differentiationProductRule, 'x') == "(cos(x)*1.0)*cos(x)*sec(x)+sin(x)*(-1.0*sin(x)*1.0)*sec(x)+sin(x)*cos(x)*(sec(x)*tan(x)*1.0)"
+
 
-    assert quickTest("xy + z", differentiate, 'z') == "1"
-    assert quickTest("z + xy", differentiate, 'z') == "1"
-    assert quickTest("z - xy", differentiate, 'z') == "1"
-    assert quickTest("xy - z", differentiate, 'z') == "-1"
 ########################
 # calculus.integration #
 ########################
 
 
 def test_integrate():
 
-    assert quickTest("x + 1", integrate, 'x') == "0.5x^(2)+x"
+    assert quickTest("x + 1", integrate, 'x') == "0.5x^(2.0)+x"
+
+    assert quickTest("xyz + xy/z + x + 1 + 1/x", integrate, 'x') == "0.5x^(2.0)yz+0.5x^(2.0)yz^(-1.0)+0.5x^(2.0)+x+1.0*log(x)"  # FIXME(integration.py): Ignore coeff if 1
+    assert quickTest("xyz + xy/z + x + 1 + 1/x", integrate, 'y') == "0.5xy^(2.0)z+0.5xy^(2.0)z^(-1.0)+xy+y+x^(-1.0)y"
+    assert quickTest("xyz + xy/z + x + 1 + 1/x", integrate, 'z') == "0.5xyz^(2.0)+xy*log(z)+xz+z+x^(-1.0)z"
 
-    assert quickTest("xyz + xy/z + x + 1 + 1/x", integrate, 'x') == "0.5x^(2)yz+0.5x^(2)yz^(-1)+0.5x^(2)+x+1.0*log(x)"  # FIXME(integration.py): Ignore coeff if 1
-    assert quickTest("xyz + xy/z + x + 1 + 1/x", integrate, 'y') == "0.5xy^(2)z+0.5xy^(2)z^(-1)+xy+y+x^(-1)y"
-    assert quickTest("xyz + xy/z + x + 1 + 1/x", integrate, 'z') == "0.5xyz^(2)+xy*log(z)+xz+z+x^(-1)z"
+    assert quickTest("sin(x)", integrate, 'x') == "-1.0*cos(x)"
+    assert quickTest("cos(x)", integrate, 'x') == "sin(x)"
+    assert quickTest("tan(x)", integrate, 'x') == "-1.0*ln(cos(x))"
+    assert quickTest("csc(x)", integrate, 'x') == "-1.0*ln((csc(x)+cot(x)))"
+    assert quickTest("sec(x)", integrate, 'x') == "ln((sec(x)+tan(x)))"
+    assert quickTest("cot(x)", integrate, 'x') == "ln(sin(x))"

tests/test_discrete.py

@@ -0,0 +1,39 @@
+from tests.tester import quickTest
+from visma.discreteMaths.combinatorics import factorial, permutation, combination
+from visma.discreteMaths.statistics import ArithemeticMean, Mode, Median
+
+
+def test_factorial():
+
+    assert quickTest("5", factorial) == "120.0"
+    assert quickTest("0", factorial) == "1"
+    assert quickTest("11", factorial) == "39916800.0"
+    assert quickTest("11 - 11", factorial) == "1"
+
+
+def test_permutation():
+
+    assert quickTest("5;2", permutation) == "20.0"
+    assert quickTest("12;3", permutation) == "1320.0"
+    assert quickTest("10 + 2;5 - 2", permutation) == "1320.0"
+    assert quickTest("11;11", permutation) == "39916800.0"
+
+
+def test_combination():
+
+    assert quickTest("5;2", combination) == "10.0"
+    assert quickTest("2;2", permutation) == "2.0"
+    assert quickTest("11;0", permutation) == "1.0"
+    assert quickTest("11;11 - 11", permutation) == "1.0"
+
+
+def test_statistics():
+
+    assert quickTest([12, 1, -12, -1, 0], ArithemeticMean) == "0.0"
+    assert quickTest([11, 1, -2, -1, 0], ArithemeticMean) == "1.8"
+
+    assert quickTest([12, 12, 12, 12, 1, -12, -1, 0], Mode) == "Mode=12;ModeFrequency=4"
+    assert quickTest([-1, -1, 2, 3, 4, 5, 6], Mode) == "Mode=-1;ModeFrequency=2"
+
+    assert quickTest([1, 2, 3, 4, 5], Median) == "3"
+    assert quickTest([1, 2, 3, 4, 5, 12], Median) == "3.5"