PTEROSOR/QUESTDB_website
10
0
Fork 0
mirror of https://github.com/LCPQ/QUESTDB_website.git synced 2024-12-25 05:43:46 +01:00
Code Releases Activity

disable float convertion on python side from and check only if it's possible

Browse Source
This commit is contained in:
Mickaël Véril 2020-02-01 16:40:11 +01:00
parent b0f1082ada
commit 89356b1b51
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/lib/data.py
View File

@ -1,7 +1,7 @@
from collections import OrderedDict from collections import OrderedDict
from TexSoup import TexSoup from TexSoup import TexSoup
from .LaTeX import newCommand from .LaTeX import newCommand
from .utils import getValFromCell,toFloat from .utils import getValFromCell,checkFloat
from TexSoup import TexNode from TexSoup import TexNode
from enum import IntEnum,auto,unique,IntFlag from enum import IntEnum,auto,unique,IntFlag
from .Format import Format from .Format import Format
@ -139,8 +139,8 @@ class dataFileBase(object):
mymethod=(method("TBE(FC)"),method("TBE")) mymethod=(method("TBE(FC)"),method("TBE"))
finsts=dataFileBase.convertState(table[first:last+1,1],default=default,firstState=firstState,commands=commands) finsts=dataFileBase.convertState(table[first:last+1,1],default=default,firstState=firstState,commands=commands)
for index,row in enumerate(table[first:last+1,]): for index,row in enumerate(table[first:last+1,]):
oscilatorForces=toFloat(str(row[2])) oscilatorForces=checkFloat(str(row[2]))
T1 = toFloat(str(row[3])) T1 = checkFloat(str(row[3]))
val,unsafe = getValFromCell(row[4]) val,unsafe = getValFromCell(row[4])
corr,unsafecorr = getValFromCell(row[7]) corr,unsafecorr = getValFromCell(row[7])
finst=finsts[index] finst=finsts[index]

7
tools/lib/utils.py
View File

@ -27,11 +27,12 @@ def getValFromCell(cell):
if type(val) is TexNode and val.name=='emph': if type(val) is TexNode and val.name=='emph':
unsafe=True unsafe=True
val=val.string val=val.string
val=toFloat(str(val)) val=checkFloat(str(val))
return (val,unsafe) return (val,unsafe)
def toFloat(x): def checkFloat(x):
try: try:
return float(x) float(x)
return x
except ValueError: except ValueError:
return None return None