Merge branch 'main' of https://git.dm1sh.ru/ADV/faculty_project

GraphWidget/Graph_example.py

@@ -2,8 +2,8 @@ import numpy as np
 import matplotlib.pyplot as plt
 
 class GraphStatic:
-    @staticmethod
+    @classmethod
-    def plot(xs: np.ndarray, ys: np.ndarray, params: dict[str, str]) -> plt.Figure:
+    def plot(cls, xs: np.ndarray, ys: np.ndarray, params: dict[str, str]) -> plt.Figure:
         """
         строим график через
         """
@@ -13,7 +13,7 @@ class GraphStatic:
         Все методы при этом статичные
         """
 
-        GraphStatic.__some_func(1, 2)
+        cls.__some_func(1, 2)
 
         """
         И возвращаем Figure

parser/README.md

@@ -37,16 +37,21 @@ Functions:
 | `cosh` | $\cosh(x)$ |
 | `cot` | $\cot(x)$ |
 | `exp` | $\exp(x)$ |
+| `inf` | $\inf(X)$ |
 | `lg` | $\lg(x)$ |
 | `ln` | $\ln(x)$ |
 | `log10` | $\log_{10}(x)$ |
 | `log2` | $\log_2(x)$ |
+| `max` | $\sup(X)$ |
+| `min` | $\inf(X)$ |
 | `prod` | $\displaystyle \prod_{i=0}^n x_i$ |
 | `sgn` | $sgn(x)$ |
+| `sign` | $sgn(x)$ |
 | `sin` | $\sin(x)$ |
 | `sinh` | $\sinh(x)$ |
 | `sqrt` | $\sqrt{x}$ |
 | `sum` | $\displaystyle\sum_{i=0}^n x_i$ |
+| `sup` | $\sup(X)$ |
 | `tan` | $\tan(x)$ |
 | `tanh` | $\tanh(x)$ |
 
@@ -58,6 +63,6 @@ Floating points: `.`, `,`
 
 Functions have only one argument, provided in braces. Operators must have two operands except minus (if it is the first character of equation or braced expression).
 
-`avg`, `sum` and `prod` applied on `numpy.ndarray` produce `float`.
+`avg`, `sum`, `max`, `sup`, `min`, `inf` and `prod` applied on `numpy.ndarray` produce `float`.
 
 **! There is no error handling yet !**

parser/parser/constants.py

@@ -0,0 +1,6 @@
+import numpy as np
+
+CONSTANTS = {
+    "e": np.e,
+    "pi": np.pi,
+}

parser/parser/operation.py

@@ -26,18 +26,23 @@ functions: dict[str, FunctionType] = {
     "cosh": np.cosh,
     "cot": cot,
     "exp": np.exp,
+    "inf": np.inf,
     "lg": np.log10,
     "ln": np.log,
     "log10": np.log10,
     "log2": np.log2,
+    "max": np.max,
+    "min": np.min,
     "prod": np.prod,
     "sgn": np.sign,
+    "sign": np.sign,
     "sin": np.sin,
     "sinh": np.sinh,
     "sqrt": np.sqrt,
     "sum": np.sum,
-    "tan": np.tan,
+    "sup": np.max,
     "tah": np.tanh,
+    "tan": np.tan,
 }
 
 operators: dict[str, OperatorType] = {

parser/parser/parser.py

@@ -1,5 +1,3 @@
-from collections.abc import Mapping
-
 from .expression import BinaryExpression, Expression, UnaryExpression, ValueExpression
 from .operation import (
     BraceOperation,
@@ -10,6 +8,7 @@ from .operation import (
 )
 from .tokenizer import Token, Tokenizer
 from .types import ValueType
+from .constants import CONSTANTS
 
 
 class Parser:
@@ -64,7 +63,8 @@ class Parser:
 
         self.__debug_expr = repr(self.val_stack)
 
-    def evaluate(self, variables: Mapping[str, ValueType]):
+    def evaluate(self, variables: dict[str, ValueType]):
+        variables |= CONSTANTS
         return self._evaluator(variables)
 
     def do_one(self):

parser/parser/tokenizer.py

@@ -15,15 +15,17 @@ class Tokenizer:
         prev = None
 
         for ch in self.expression:
-            if (breaker_type := self.is_breaker(ch)) is not None:
+            if (breaker_type := Tokenizer.is_breaker(ch)) is not None:
                 if len(accumulator) > 0:
                     # ch is `(` after function name
-                    if breaker_type == Token.LBrace and self.is_function(accumulator):
+                    if breaker_type == Token.LBrace and Tokenizer.is_function(
+                        accumulator
+                    ):
                         yield accumulator, Token.Function
                         prev = Token.Function
                         accumulator = ""
                     else:
-                        value, token_type = self.detect_number(accumulator)
+                        value, token_type = Tokenizer.detect_number(accumulator)
                         yield value, token_type
                         prev = token_type
                         accumulator = ""