Skip to content

Resolvesd issue #231 #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gr8geek wants to merge 7 commits into
base: dev
Choose a base branch
from
Open

Resolvesd issue #231 #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dd063d0
readme improved
notimeforcaution Jul 25, 2019
620ffbc
minor typo
notimeforcaution Jul 31, 2019
a3d6dfd
Merge pull request #211 from mayankDhiman/md_readme
notimeforcaution Jul 31, 2019
e0b8ea1
Merge pull request #220 from aerospaceresearch/dev
notimeforcaution Aug 23, 2019
1472089
new version 1.0.0.0
notimeforcaution Aug 31, 2019
b55ab4a
Merge pull request #221 from mayankDhiman/master
notimeforcaution Aug 31, 2019
5d086f6
Resolvesd PR #231
gr8geek Feb 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

```


Expand Down Expand Up @@ -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.


Expand Down
Binary file added assets/demo-cli.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified run
100644 → 100755
View file
Open in desktop
Empty file.
6 changes: 3 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Empty file added visma/discreteMaths/__init__.py
View file
Open in desktop
Empty file.
6 changes: 5 additions & 1 deletion visma/io/tokenize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def getTerms(eqn):
terms = []
while x < len(eqn):

if ('a' <= eqn[x] <= 'z') or ('A' <= eqn[x] <= 'Z') or eqn[x] in greek:
if ('a' <= eqn[x] <= 'z') or ('A' <= eqn[x] <= 'Z') or eqn[x] in greek or eqn[x] in constants:

buf = eqn[x]
if x + 3 < len(eqn):
Expand Down Expand Up @@ -103,6 +103,10 @@ def getTerms(eqn):
terms.append("exp")
x += 1
continue
elif eqn[x] ==constants[0]:
terms.append(str(math.pi))
x += 1
continue
elif eqn[x] == 'i':
terms.append("iota")
x += 1
Expand Down