diff --git a/README.md b/README.md index bdf0c95..bf4b1a5 100644 --- a/README.md +++ b/README.md @@ -46,13 +46,28 @@ $ visma >>> gui ``` -**Note:** For windows user (and those for whom) the above launching option is not available, to launch **visma** GUI do +- For windows user (and those for whom) the above launching option is not available, to launch **visma** do, from here you will be redirected to VisMa interactive shell, which can be used to open GUI or CLI ```shell $ python3 >>> from visma.main import init ->>> init() # for starting visma ->>> gui # for visma gui +>>> init() +Welcome! This is Visual Maths Interactive Shell... +type 'help' for a User Manual and Ctrl + D to Exit prompt + +>>> simplify(2 + x + 11) +INPUT: 2.0 + x + 11.0 +OPERATION: simplify +OUTPUT: 13.0 + x + +2.0 + x + 11.0 + +(Adding 11.0 and 2.0) +13.0 + x + +>>> +[5]+ Stopped python3 + ``` @@ -91,13 +106,15 @@ $ pip --version For code documentation and learning how to use **visma** check out the [wiki](https://github.com/aerospaceresearch/visma/wiki). -Below is a quick demo of using **visma** and some of its capabilities. - - ## Demo +Below are some demos showing visma and its capabilities: +- GUI ![visma](https://raw.githubusercontent.com/wiki/aerospaceresearch/visma/assets/demo.gif) +- CLI +![](/assets/demo-cli.gif) + To see all features of **visma**, check [this](https://github.com/aerospaceresearch/visma/wiki/Features) out. diff --git a/assets/demo-cli.gif b/assets/demo-cli.gif new file mode 100644 index 0000000..6736ece Binary files /dev/null and b/assets/demo-cli.gif differ diff --git a/run b/run old mode 100644 new mode 100755 diff --git a/setup.py b/setup.py index 306217c..7de4372 100644 --- a/setup.py +++ b/setup.py @@ -6,9 +6,9 @@ setuptools.setup( name="VISualMAth", description="visma - VISual MAth : A math equation solver and visualizer", - version="0.2.3", - author="Siddharth Kothiyal, Shantanu Mishra", - author_email="sid.kothiyal27@gmail.com, 8hantanu@gmail.com", + version="1.0.0.0", + author="Siddharth Kothiyal, Shantanu Mishra, Mayank Dhiman", + author_email="sid.kothiyal27@gmail.com, 8hantanu@gmail.com, mdhiman536@gmail.com", long_description=long_description, long_description_content_type="text/markdown", url="https://github.com/aerospaceresearch/visma", diff --git a/visma/discreteMaths/__init__.py b/visma/discreteMaths/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/visma/solvers/polynomial/quadratic.py b/visma/solvers/polynomial/quadratic.py index e404494..a811ed7 100644 --- a/visma/solvers/polynomial/quadratic.py +++ b/visma/solvers/polynomial/quadratic.py @@ -40,19 +40,19 @@ def getRootsQuadratic(coeffs): if d == 0: roots.append(-(coeffs[1] / (2 * coeffs[2]))) animations += [[]] - comments += [['Value of determinant is: ' + str(d) + ' thus, Only one roots']] + comments += [['Value of discriminant is: ' + str(d) + ' thus, Only one roots']] elif d > 0: + comments += [['Value of discriminant is: ' + str(d) + ' thus, two (real) roots']] d = math.sqrt(d) roots.append(-(coeffs[1] + d) / (2 * coeffs[2])) roots.append(-(coeffs[1] - d) / (2 * coeffs[2])) animations += [[]] - comments += [['Value of determinant is: ' + str(d) + ' thus, two (real) roots']] else: imaginary = [-(coeffs[1] / (2 * coeffs[2])), -1, (math.sqrt(-d)) / (2 * coeffs[2])] roots = imaginary animations += [[]] - comments += [['Value of determinant is: ' + str(d) + ' thus, two (imaginary) roots']] + comments += [['Value of discriminant is: ' + str(d) + ' thus, two (imaginary) roots']] return roots, animations, comments