Add new Quality of Life Features and Improve Several Functionalities

CONTRIBUTING.md

@@ -11,6 +11,7 @@ This is a brief guide on using **visma(VISualMAth)** and for making any contribu
 * **Integration** - integrate a polynomial expression wrt a chosen variable
 * **Differentiation** - differentiate a polynomial expression wrt a chosen variable
 * **Plot** - plots an interactive 2D or 3D graph
+* **Matrix Operations** -  This feature will allow you to add, subtract, and multiply two matrices. Can also perform various simplifications on an individual matrix.
 
 ![visma](https://raw.githubusercontent.com/wiki/aerospaceresearch/visma/assets/demo.gif)
 

README.md

@@ -1,7 +1,8 @@
 <h1 align="center">
   visma - VISual MAth
 </h1>
-
+<!-- bruh momento -->
+<!-- bruhbruhbruh -->
 <h4 align="center">
 A math equation solver and visualizer
 </h4>

main.py

@@ -14,7 +14,7 @@ def init():
     class VisMa_Prompt(Cmd):
         '''This inititates the main VisMa Prompt from where user may move to CLI/GUI'''
 
-        userManual = "|_________________________________________________________________________________________________|\n"\
+        userManual = " _________________________________________________________________________________________________ \n"\
                      "| gui  ->> opens Visma in GUI mode.                                                               |\n"\
                      "| Ctrl + D ->> Closes the prompt.                                                                     |\n"\
                      "| exit ->> Closes the prompt.                                                                     |\n"\
@@ -31,6 +31,10 @@ class VisMa_Prompt(Cmd):
                      "|-------------------------------------------------------------------------------------------------|\n"\
                      "| integrate( expression , variable )  ->> Integrates the expression by the given variable.        |\n"\
                      "| differentiate( expression , variable ) ->> Differentiates the expression by the given variable. |\n"\
+                     "|-------------------------------------------------------------------------------------------------|\n"\
+                     "| Matrices should be input in the following format:                                               |\n"\
+                     "| Single: mat_([x00 x01; x10 x11])                                                                |\n"\
+                     "| Double: mat_([x00 x01; x10 x11], [y00 y01; y10 y11])                                            |\n"\
                      "|_________________________________________________________________________________________________|\n"\
 
         prompt = '>>> '

tests/test_simplify.py

@@ -10,6 +10,9 @@
 
 def test_simplify():
 
+    assert quickTest("4 + (3/(3-4)*3)", simplify) == "-5"
+
+
     assert quickTest("1 + 2 - 3", simplify) == "0"
     assert quickTest("1 + 2 - 4", simplify) == "-1.0"
     assert quickTest("0 + 0 + 1", simplify) == "1.0"

visma/functions/structure.py

@@ -1,6 +1,104 @@
 import copy
 
 
+def tokensToString(tokens):
+    """Converts tokens to text string
+
+    Arguments:
+        tokens {list} -- list of function tokens
+
+    Returns:
+        tokenString {string} -- equation string
+    """
+    # FIXME: tokensToString method
+    # tokenString = ''
+    # for token in tokens:
+    #     if isinstance(token, Constant):
+    #         if isinstance(token.value, list):
+    #             for j, val in token.value:
+    #                 if token['power'][j] != 1:
+    #                     tokenString += (str(val) + '^(' + str(token.power[j]) + ')')
+    #                 else:
+    #                     tokenString += str(val)
+    #         elif isNumber(token.value):
+    #             if token.power != 1:
+    #                 tokenString += (str(token.value) + '^(' + str(token.power) + ')')
+    #             else:
+    #                 tokenString += str(token.value)
+    #     elif isinstance(token, Variable):
+    #         if token.coefficient == 1:
+    #             pass
+    #         elif token.coefficient == -1:
+    #             tokenString += '-'
+    #         else:
+    #             tokenString += str(token.coefficient)
+    #         for j, val in enumerate(token.value):
+    #             if token.power[j] != 1:
+    #                 tokenString += (str(val) + '^(' + str(token.power[j]) + ')')
+    #             else:
+    #                 tokenString += str(val)
+    #     elif isinstance(token, Binary):
+    #         tokenString += ' ' + str(token.value) + ' '
+    #     elif isinstance(token, Expression):
+    #         if token.coefficient != 1:
+    #             tokenString += str(token.coefficient) + '*'
+    #         tokenString += '('
+    #         tokenString += tokensToString(token.tokens)
+    #         tokenString += ')'
+    #         if token.power != 1:
+    #             tokenString += '^(' + str(token.power) + ')'
+    #     elif isinstance(token, Sqrt):
+    #         tokenString += 'sqrt['
+    #         if isinstance(token.power, Constant):
+    #             tokenString += tokensToString([token.power])
+    #         elif isinstance(token.power, Variable):
+    #             tokenString += tokensToString([token.power])
+    #         elif isinstance(token.power, Expression):
+    #             tokenString += tokensToString(token.power.tokens)
+    #         tokenString += ']('
+    #         if isinstance(token.operand, Constant):
+    #             tokenString += tokensToString([token.operand])
+    #         elif isinstance(token.operand, Variable):
+    #             tokenString += tokensToString([token.operand])
+    #         elif isinstance(token.operand, Expression):
+    #             tokenString += tokensToString(token.operand.tokens)
+    #         tokenString += ')'
+    #     elif isinstance(token, Logarithm):
+    #         if token.coefficient == 1:
+    #             pass
+    #         elif token.coefficient == -1:
+    #             tokenString += '-'
+    #         else:
+    #             tokenString += str(token.coefficient)
+    #         if token.operand is not None:
+    #             tokenString += token.value
+    #             if token.power != 1:
+    #                 tokenString += "^" + "(" + str(token.power) + ")"
+    #             tokenString += "(" + tokensToString([token.operand]) + ")"
+    #     elif isinstance(token, Trigonometric):
+    #         if token.coefficient == 1:
+    #             pass
+    #         elif token.coefficient == -1:
+    #             tokenString += '-'
+    #         else:
+    #             tokenString += str(token.coefficient)
+    #         if token.operand is not None:
+    #             tokenString += token.value
+    #             if token.power != 1:
+    #                 tokenString += "^" + "(" + str(token.power) + ")"
+    #             tokenString += "(" + tokensToString([token.operand]) + ")"
+    #     elif isinstance(token, Matrix):
+    #         tokenString += "["
+    #         for i in range(token.dim[0]):
+    #             for j in range(token.dim[1]):
+    #                 tokenString += tokensToString(token.value[i][j])
+    #                 tokenString += ","
+    #             tokenString = tokenString[:-1] + ";"
+    #         tokenString = tokenString[:-1] + "]"
+    #
+    # return tokenString
+
+
 class Function(object):
     """Basis function class for all functions
 

visma/gui/cli.py

@@ -1,6 +1,7 @@
 import copy
 import sys
 from PyQt5.QtWidgets import QMainWindow, QApplication, QWidget, QTabWidget, QVBoxLayout
+from PyQt5.QtCore import Qt
 from visma.calculus.differentiation import differentiate
 from visma.calculus.integration import integrate
 from visma.discreteMaths.combinatorics import factorial, combination, permutation

visma/gui/logger.py

@@ -16,6 +16,7 @@
 def logTextBox(workspace):
     workspace.logBox = QTextEdit()
     workspace.logBox.setReadOnly(True)
+    workspace.logBox.setStyleSheet("background-color: rgb(210, 210, 210)") # colors inside of logger
     textLayout = QVBoxLayout()
     textLayout.addWidget(workspace.logBox)
     return textLayout

visma/gui/plotter.py

@@ -193,6 +193,8 @@ class NavigationCustomToolbar(NavigationToolbar):
     layout = QVBoxLayout()
     layout.addWidget(workspace.canvas2D)
     layout.addWidget(workspace.toolbar2D)
+    workspace.figure2D.set_facecolor("none") # makes color transparent
+    workspace.canvas2D.setStyleSheet("background-color: rgb(210, 210, 210)")
     return layout
 
 
@@ -216,6 +218,9 @@ class NavigationCustomToolbar(NavigationToolbar):
     layout = QVBoxLayout()
     layout.addWidget(workspace.canvas3D)
     layout.addWidget(workspace.toolbar3D)
+    workspace.figure3D.set_facecolor("none") # makes color transparent
+    workspace.canvas3D.setStyleSheet("background-color: rgb(210, 210, 210)")
+
     return layout
 
 
@@ -307,6 +312,7 @@ def plot(workspace, tokens=None):
         renderPlot(workspace, graphVars, func, variables, tokens)
 
 
+
 def selectAdditionalVariable(var1):
     if var1 == 'z':
         var2 = 'a'

visma/gui/qsolver.py

@@ -81,8 +81,7 @@ def qSolveFigure(workspace):
     """
 
     bg = workspace.palette().window().color()
-    bgcolor = (bg.redF(), bg.greenF(), bg.blueF())
-    workspace.qSolveFigure = Figure(edgecolor=bgcolor, facecolor=bgcolor)
+    workspace.qSolveFigure = Figure(edgecolor="none", facecolor="none") # Make transparent so parent can override background
     workspace.solcanvas = FigureCanvas(workspace.qSolveFigure)
     workspace.qSolveFigure.clear()
     qSolLayout = QtWidgets.QVBoxLayout()

visma/gui/steps.py

@@ -18,9 +18,11 @@ def stepsFigure(workspace):
     """
     workspace.stepsfigure = Figure()
     workspace.stepscanvas = FigureCanvas(workspace.stepsfigure)
+    workspace.stepsfigure.set_facecolor("none") # make figure transparent so that background of scrollbar is visible
     workspace.stepsfigure.clear()
     workspace.scroll = QScrollArea()
     workspace.scroll.setWidget(workspace.stepscanvas)
+    workspace.scroll.setStyleSheet("background-color: rgb(210, 210, 210)") # color background of scrollbar
     stepslayout = QVBoxLayout()
     stepslayout.addWidget(workspace.scroll)
     return stepslayout
@@ -37,7 +39,7 @@ def showSteps(workspace):
                                    verticalalignment='top', size=qApp.font().pointSize()*workspace.stepsFontSize)
     workspace.stepscanvas.draw()
     hbar = workspace.scroll.horizontalScrollBar()
-    hbar.setValue((hbar.minimum()+hbar.maximum())/2)
+    hbar.setValue((hbar.minimum()+hbar.maximum())//2)
 
 
 ###############