Skip to content

GitLab

Unverified Commit 493d4a87 authored by Gao, Xiang's avatar Gao, Xiang Committed by GitHub
Browse files

Allow parsing negative values (#114)

parent 557a79db
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 10 deletions
torchani/neurochem/__init__.py
View file @ 493d4a87
......@@ -126,8 +126,8 @@ def load_atomic_network(filename):
start: inputsize atom_net
value : INT
| FLOAT
value : SIGNED_INT
| SIGNED_FLOAT
| "FILE" ":" FILENAME "[" INT "]"
FILENAME : ("_"|"-"|"."|LETTER|DIGIT)+
......@@ -137,7 +137,8 @@ def load_atomic_network(filename):
%import common.WORD
%import common.DIGIT
%import common.INT
%import common.FLOAT
%import common.SIGNED_INT
%import common.SIGNED_FLOAT
%import common.CNAME
%import common.WS
%ignore WS
......@@ -156,9 +157,9 @@ def load_atomic_network(filename):
v = v[0]
if v.type == 'FILENAME':
v = v.value
elif v.type == 'INT':
elif v.type == 'SIGNED_INT' or v.type == 'INT':
v = int(v.value)
elif v.type == 'FLOAT':
elif v.type == 'SIGNED_FLOAT' or v.type == 'FLOAT':
v = float(v.value)
else:
raise ValueError('unexpected type')
......@@ -363,8 +364,8 @@ class Trainer:
start: params network_setup params
value : INT
| FLOAT
value : SIGNED_INT
| SIGNED_FLOAT
| STRING_VALUE
STRING_VALUE : ("_"|"-"|"."|"/"|LETTER)("_"|"-"|"."|"/"|LETTER|DIGIT)*
......@@ -374,7 +375,8 @@ class Trainer:
%import common.WORD
%import common.DIGIT
%import common.INT
%import common.FLOAT
%import common.SIGNED_INT
%import common.SIGNED_FLOAT
%import common.CNAME
%import common.WS
%ignore WS
......@@ -393,9 +395,9 @@ class Trainer:
v = v[0]
if v.type == 'STRING_VALUE':
v = v.value
elif v.type == 'INT':
elif v.type == 'SIGNED_INT' or v.type == 'INT':
v = int(v.value)
elif v.type == 'FLOAT':
elif v.type == 'SIGNED_FLOAT' or v.type == 'FLOAT':
v = float(v.value)
else:
raise ValueError('unexpected type')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment