alu/tra-analysis
1
0
Fork 0
mirror of https://github.com/titanscouting/tra-analysis.git synced 2024-12-27 01:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed depreciated escape sequences

Browse Source
This commit is contained in:
Arthur Lu 2021-01-27 04:08:27 +00:00
parent 8f54b8e3fc
commit 106d7a7f47
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
analysis-master/tra_analysis/__init__.py
View File

@ -25,11 +25,11 @@ __author__ = (
__all__ = [
]
from . import Analysis
from . import Analysis as Analysis
from .Array import Array
from .ClassificationMetric import ClassificationMetric
from . import CorrelationTest
from . import Equation
from .equation import Expression
from . import Fit
from . import KNN
from . import NaiveBayes

40
analysis-master/tra_analysis/equation/parser/Hybrid_Utils/ExpressionCore.py
View File

@ -157,56 +157,56 @@ class Core():
unary_ops = {}
ops = {}
functions = {}
smatch = re.compile("\s*,")
vmatch = re.compile("\s*"
smatch = re.compile(r"\s*,")
vmatch = re.compile(r"\s*"
"(?:"
"(?P<oct>"
"(?P<octsign>[+-]?)"
"\s*0o"
r"\s*0o"
"(?P<octvalue>[0-7]+)"
")|(?P<hex>"
"(?P<hexsign>[+-]?)"
"\s*0x"
r"\s*0x"
"(?P<hexvalue>[0-9a-fA-F]+)"
")|(?P<bin>"
"(?P<binsign>[+-]?)"
"\s*0b"
r"\s*0b"
"(?P<binvalue>[01]+)"
")|(?P<dec>"
"(?P<rsign>[+-]?)"
"\s*"
"(?P<rvalue>(?:\d+\.\d+|\d+\.|\.\d+|\d+))"
r"\s*"
r"(?P<rvalue>(?:\d+\.\d+|\d+\.|\.\d+|\d+))"
"(?:"
"[Ee]"
"(?P<rexpoent>[+-]?\d+)"
r"(?P<rexpoent>[+-]?\d+)"
")?"
"(?:"
"\s*"
"(?P<sep>(?(rvalue)\+|))?"
"\s*"
r"\s*"
r"(?P<sep>(?(rvalue)\+|))?"
r"\s*"
"(?P<isign>(?(rvalue)(?(sep)[+-]?|[+-])|[+-]?)?)"
"\s*"
"(?P<ivalue>(?:\d+\.\d+|\d+\.|\.\d+|\d+))"
r"\s*"
r"(?P<ivalue>(?:\d+\.\d+|\d+\.|\.\d+|\d+))"
"(?:"
"[Ee]"
"(?P<iexpoent>[+-]?\d+)"
r"(?P<iexpoent>[+-]?\d+)"
")?"
"[ij]"
")?"
")"
")")
nmatch = re.compile("\s*([a-zA-Z_][a-zA-Z0-9_]*)")
gsmatch = re.compile('\s*(\()')
gematch = re.compile('\s*(\))')
nmatch = re.compile(r"\s*([a-zA-Z_][a-zA-Z0-9_]*)")
gsmatch = re.compile(r'\s*(\()')
gematch = re.compile(r'\s*(\))')
def recalculateFMatch(self):
fks = sorted(self.functions.keys(), key=len, reverse=True)
oks = sorted(self.ops.keys(), key=len, reverse=True)
uks = sorted(self.unary_ops.keys(), key=len, reverse=True)
self.fmatch = re.compile('\s*(' + '|'.join(map(re.escape,fks)) + ')')
self.omatch = re.compile('\s*(' + '|'.join(map(re.escape,oks)) + ')')
self.umatch = re.compile('\s*(' + '|'.join(map(re.escape,uks)) + ')')
self.fmatch = re.compile(r'\s*(' + '|'.join(map(re.escape,fks)) + ')')
self.omatch = re.compile(r'\s*(' + '|'.join(map(re.escape,oks)) + ')')
self.umatch = re.compile(r'\s*(' + '|'.join(map(re.escape,uks)) + ')')
def addFn(self,id,str,latex,args,func):
self.functions[id] = {