0.0.2b0

Author: eanorambuena

.gitignore

@@ -1,2 +1,3 @@
 eggconfig.py
-.pypirc
+.pypirc
+*_pycache__*

eggdriver/resources/constants.py

@@ -26,4 +26,4 @@
 
 square = 2 * segment
 whiteSquare = white + square
-blackSquare = black + square
+blackSquare = black + square

eggdriver/resources/math/constants.py

@@ -6,4 +6,4 @@
 pi = 3.1415926535897932384626433832795028841971693993751058209749445923078164062
 
 def itself(var):
-    return var
+    return var

eggdriver/resources/math/float.py

@@ -8,4 +8,5 @@ def floor(x):
     return math.floor(x)
 
 def ceil(x):
-    return math.ceil(x)
+    return math.ceil(x)
+    

eggdriver/resources/math/functions.py

@@ -25,4 +25,4 @@ def sin(x):
 def tan(x):
     def tan_function(x):
         return sin(x) / cos(x)
-    return lim(tan_function, x)
+    return lim(tan_function, x)

eggdriver/resources/math/polynomial.py

@@ -1,9 +1,12 @@
 from eggdriver.resources.math.linear import Vector, dualExpand, vectorize
 from eggdriver.resources.math.algorithms.solver import solve
-from eggdriver.resources.structures.objects import varName
+from eggdriver.resources.structures.objects import var, varName
 
-def x(var):
-    return var
+x = var("x")
+
+from eggdriver.resources.math.linear import Vector, dualExpand, vectorize
+from eggdriver.resources.math.algorithms.solver import solve
+from eggdriver.resources.structures.objects import varName
 
 class Polynomial(Vector):
     def __init__(self, poly = [], variable = x):
@@ -42,14 +45,11 @@ def eval(self, x):
         result = 0
         for i in range(0, self.size):
             f = self[i]
-            result += f * (self.variable(x) ** i)
+            result += f * (self.variable.eval(x) ** i)
         return result
     @property
     def var(self):
-        name = varName(self.variable)
-        if name != None:
-            return name
-        return "x"
+        return self.variable.var
 
     @property
     def zeros(self):
@@ -62,19 +62,19 @@ def degree(self):
                 deg = i
         return deg
 
-def x_powered(i, variable = "x"):
+def x_powered(i, variable_str = "x"):
     if i == 0 :
         return ""
     elif i == 1:
-        return variable
-    return f"{variable}^{i}"
+        return variable_str
+    return f"{variable_str}^{i}"
 
 def plusPoly(a, b):
     if type(a) != Polynomial:
         a = Polynomial([a])
     if type(b) != Polynomial:
         b = Polynomial([b])
-    result = Polynomial()
+    result = Polynomial([], a.variable)
     if len(a) != len(b):
         dualExpand(a, b)
     if len(a) != 0 and len(a) == len(b):
@@ -83,14 +83,14 @@ def plusPoly(a, b):
     return result
 
 def scalePoly(polynomial, scalar):
-    result = Vector()
+    result = Polynomial([], polynomial.variable)
     if polynomial.size != 0:
         for i in polynomial:
             result.append(scalar * i)
     return result
 
 def times(a, b):
-    result = Polynomial()
+    result = Polynomial([], a.variable)
     if len(a) != 0:
         for i in range(0, len(a)):
             product = Polynomial()
@@ -106,5 +106,3 @@ def fromZeros(zeros = []):
     for i in zeros:
         result = Polynomial([-i, 1]).times(result)
     return result
-
-

eggdriver/resources/structures/objects.py

@@ -1,4 +1,5 @@
 # Imports
+from eggdriver.resources.utils import itself
 from eggdriver.resources.strings import normalize
 
 """
@@ -82,8 +83,9 @@ def printVarType(variable):
 >>> El camion es mio
 """
 class var():
-    def __init__(self, var):
+    def __init__(self, var, definition_function = itself):
         self.var = var
+        self.__function__ = definition_function
     @property
     def float(self):
         return float(self.int)
@@ -108,6 +110,12 @@ def bool(self):
     @property
     def norm(self): # Remove accents from words
         return normalize(self.str)
+    def __str__(self):
+        return varName(self)
+    def __repr__(self):
+        return f"var({str(self.var)}, {str(varName(self.__function__))})"
+    def eval(self, value):
+        return self.__function__(value)
 
 if __name__ == "__main__":
     If = "you are reading this,"

eggdriver/resources/utils.py

@@ -32,4 +32,7 @@ def comment(file):
 		text = line.split("#")
 		commentary = text[1] 
 		if commentary.split(" ")[0] == "$doc":
-			commentary = 3 * "\"" + commentary[5:] + 3 * "\""           """
+			commentary = 3 * "\"" + commentary[5:] + 3 * "\""           """
+
+def itself(var):
+    return var

setup.py

@@ -1,4 +1,4 @@
-v = "0.0.1"
+v = "0.0.2b0"
 """A setuptools based setup module.
 See:
 https://packaging.python.org/guides/distributing-packages-using-setuptools/
@@ -88,7 +88,7 @@
         #   3 - Alpha
         #   4 - Beta
         #   5 - Production/Stable
-        'Development Status :: 5 - Production/Stable',
+        'Development Status :: 4 - Beta',
 
         # Indicate who your project is intended for
         'Intended Audience :: Developers',
@@ -101,10 +101,10 @@
         # that you indicate you support Python 3. These classifiers are *not*
         # checked by 'pip install'. See instead 'python_requires' below.
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3 :: Only',
     ],
 
@@ -135,15 +135,15 @@
     # 'Programming Language' classifiers above, 'pip install' will check this
     # and refuse to install the project if the version does not match. See
     # https://packaging.python.org/guides/distributing-packages-using-setuptools/#python-requires
-    python_requires = '>=3.6, <4',
+    python_requires = '>=3.5, <=3.8',
 
     # This field lists other packages that your project depends on to run.
     # Any package you put here will be installed by pip when your project is
     # installed, so they must be valid existing projects.
     #
     # For an analysis of "install_requires" vs pip's requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires = ["numpy", "tensorflow", "keras", "Colr", "opencv-contrib-python", "mediapipe", "pipwin"],# + ["nqs"] disabled
+    install_requires = ["numpy", "tensorflow", "keras", "Colr", "opencv-contrib-python", "mediapipe", "pipwin"],
 
     # List additional groups of dependencies here (e.g. development
     # dependencies). Users will be able to install these using the "extras"