From a8cedc9edc7e072a779847c10f13f9db2c22cff8 Mon Sep 17 00:00:00 2001 From: Sirin Puenggun Date: Wed, 5 Jul 2023 14:54:52 +0700 Subject: [PATCH] Change Project structure --- main.py | 10 +++++----- nessesary/__pycache__/fraction.cpython-310.pyc | Bin 5273 -> 0 bytes nessesary/__pycache__/matrix.cpython-310.pyc | Bin 4800 -> 0 bytes .../parser/__pycache__/parser.cpython-310.pyc | Bin 245 -> 0 bytes .../parser/__pycache__/structure.cpython-310.pyc | Bin 1411 -> 0 bytes .../nessesary}/equation/processing.py | 4 ++-- {nessesary => src/nessesary}/fraction.py | 0 {nessesary => src/nessesary}/matrix.py | 0 {nessesary => src/nessesary}/parser/__init__.py | 0 {nessesary => src/nessesary}/parser/parser.py | 0 {nessesary => src/nessesary}/polynomial.py | 4 ++-- {nessesary => src}/preparer/PrepareExpression.py | 0 tests/preparer_tester.py | 2 +- 13 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 nessesary/__pycache__/fraction.cpython-310.pyc delete mode 100644 nessesary/__pycache__/matrix.cpython-310.pyc delete mode 100644 nessesary/parser/__pycache__/parser.cpython-310.pyc delete mode 100644 nessesary/parser/__pycache__/structure.cpython-310.pyc rename {nessesary => src/nessesary}/equation/processing.py (97%) rename {nessesary => src/nessesary}/fraction.py (100%) rename {nessesary => src/nessesary}/matrix.py (100%) rename {nessesary => src/nessesary}/parser/__init__.py (100%) rename {nessesary => src/nessesary}/parser/parser.py (100%) rename {nessesary => src/nessesary}/polynomial.py (99%) rename {nessesary => src}/preparer/PrepareExpression.py (100%) diff --git a/main.py b/main.py index 96244ec..6362396 100644 --- a/main.py +++ b/main.py @@ -1,9 +1,9 @@ -from nessesary.matrix import Matrix -from nessesary.parser.parser import insert_mul_sign -from nessesary.polynomial import Polynomial -from nessesary.fraction import to_fraction +from src.nessesary.matrix import Matrix +from src.nessesary.parser.parser import insert_mul_sign +from src.nessesary.polynomial import Polynomial +from src.nessesary.fraction import to_fraction from file_read_write import * -from nessesary.equation.processing import change_side, poly_expand, simplify +from src.nessesary.equation.processing import change_side, poly_expand, simplify import ast def guide(): diff --git a/nessesary/__pycache__/fraction.cpython-310.pyc b/nessesary/__pycache__/fraction.cpython-310.pyc deleted file mode 100644 index 34e85a69e2bf5daa872ff4a1b39b25bbed8032fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5273 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 diff --git a/nessesary/parser/__pycache__/parser.cpython-310.pyc b/nessesary/parser/__pycache__/parser.cpython-310.pyc deleted file mode 100644 index fbb28a293ed8fb9ac51034c3f2e4f49b1b4e935f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 245 zcmd1j<>g`kf;~qXla+z=V-N=!FabFZKwQiNBvKes7+V;k7*d#m88n%b8G%AD0AhpG zIs-9SZ3#mSLo*{IP!CWoqn{?@E!Kjf%)Am!#weE5ih`n*3`HRIzcf;;VuDk14davZ za|?>{)8m0eR%&udOhIB%acU8i(krOE#SRk5%u5GZRSeS0!&t-uq=06FX|Q=n1T#?X R7Kcr4eoARhsvSZX0{|&fE~)?k diff --git a/nessesary/parser/__pycache__/structure.cpython-310.pyc b/nessesary/parser/__pycache__/structure.cpython-310.pyc deleted file mode 100644 index af13776177487da1a2725ca294c1ee7c851b40a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1411 zcmZXT&2!sS5WuyvWXrOhq~C4&#eoCnBT%5FFr5yno3tKe*|qG@*}8a)S9O#4E0P@& zCYgbm9yxOcZv0Dog-iYgpLnZSns$)q{dV`a@4b1?mM5i>t*NK>@0zP5?-duc!jRuRl17T=o+rmI$j@Wbp0>D8!FyV@h07*TW>VH zMYnye{NAZLk#-6KIpt|aUR*(}E1Vw?|^^^pG;FVw?crDlw>53>aQB>@e&y>@f@(Mhs(y3B#0OpCM$37-kG}h69G5 z7!DbZ7=A9>40jklXZV8QONP4)_ZYrnxX$MAZqn4`WwMT}ioLW4E$&pk9xH zw}6ip@Cn0*3;1*aKQL@8;DZH}7w}>MFUzZ(?M*#cF4I^(YC09R&upBR9Jle*d9>N;x>di$nQgVo z^4hg!sj_kgjo@$^Vj&Eo`Eb@9?nE;-4|>CS@V6GC`dJru>6?xpjP7*%lhHJs47v)t zL4Vd62T>G6z3`|r?S)YgcA{B0@6YC8urWR2(jXWIVQ<)tn;**ya$mvFEwG^Y&R9!o z{atUxwGH|&h8}j*Vy}EV+*UDsE@%k86S#t!z!TI3zMv&|CTJ>P-hb9?b+_7H1ueho zEwf79UuG>QasFoI%-O1&$aw@HQv+B5* zaqCY|cfGJJNBv$P*Nwmbx9~zawjPWoG#>^J<$oAGR4^d^WR?+(BunC1|9`Y}%Pi{u E0s2E%sQ>@~ diff --git a/nessesary/equation/processing.py b/src/nessesary/equation/processing.py similarity index 97% rename from nessesary/equation/processing.py rename to src/nessesary/equation/processing.py index be65d72..40a7cb6 100644 --- a/nessesary/equation/processing.py +++ b/src/nessesary/equation/processing.py @@ -1,5 +1,5 @@ -from nessesary.polynomial import Polynomial -from nessesary.parser.parser import is_op, insert_mul_sign, is_num +from src.nessesary.polynomial import Polynomial +from src.nessesary.parser.parser import is_op, insert_mul_sign, is_num import re def change_side(equa:str): diff --git a/nessesary/fraction.py b/src/nessesary/fraction.py similarity index 100% rename from nessesary/fraction.py rename to src/nessesary/fraction.py diff --git a/nessesary/matrix.py b/src/nessesary/matrix.py similarity index 100% rename from nessesary/matrix.py rename to src/nessesary/matrix.py diff --git a/nessesary/parser/__init__.py b/src/nessesary/parser/__init__.py similarity index 100% rename from nessesary/parser/__init__.py rename to src/nessesary/parser/__init__.py diff --git a/nessesary/parser/parser.py b/src/nessesary/parser/parser.py similarity index 100% rename from nessesary/parser/parser.py rename to src/nessesary/parser/parser.py diff --git a/nessesary/polynomial.py b/src/nessesary/polynomial.py similarity index 99% rename from nessesary/polynomial.py rename to src/nessesary/polynomial.py index 066548c..0adf9ed 100644 --- a/nessesary/polynomial.py +++ b/src/nessesary/polynomial.py @@ -1,5 +1,5 @@ -from nessesary.parser.parser import parse_poly -from nessesary.fraction import to_fraction +from src.nessesary.parser.parser import parse_poly +from src.nessesary.fraction import to_fraction from math import acos, cos, pi class Polynomial: diff --git a/nessesary/preparer/PrepareExpression.py b/src/preparer/PrepareExpression.py similarity index 100% rename from nessesary/preparer/PrepareExpression.py rename to src/preparer/PrepareExpression.py diff --git a/tests/preparer_tester.py b/tests/preparer_tester.py index 2da39d3..51567af 100644 --- a/tests/preparer_tester.py +++ b/tests/preparer_tester.py @@ -3,7 +3,7 @@ import sys sys.path.append('..') -from nessesary.preparer.PrepareExpression import PrepareExpression +from src.preparer.PrepareExpression import PrepareExpression class TestPrepareExpression: preparer = PrepareExpression()