lafrite/Mapytex
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add case if there is no condition

Browse Source
This commit is contained in:
lafrite 2014-01-17 11:19:28 +01:00
parent 36bebd6c1a
commit 9dfb1ed574
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
random_expression.py
View File

@ -26,7 +26,6 @@ class RdExpression(object):
""" """
pattern = "\{(\w+)\}" pattern = "\{(\w+)\}"
varia = re.findall(pattern, self._form) varia = re.findall(pattern, self._form)
print(varia)
return list(set(varia)) return list(set(varia))
def __call__(self, val_min = -10, val_max = 10): def __call__(self, val_min = -10, val_max = 10):
@ -56,14 +55,19 @@ class RdExpression(object):
:returns: boolean :returns: boolean
""" """
return eval(" and ".join(self._conditions).format(**self._gene_varia)) if self._conditions != []:
return eval(" and ".join(self._conditions).format(**self._gene_varia))
else:
return True
if __name__ == '__main__': if __name__ == '__main__':
form = "{a}x + 2*{b}" form = "{a}x + 2*{b}"
cond = ["{a} + {b} in [1, 2, 3, 4, 5]"] cond = ["{a} + {b} in [1, 2, 3, 4, 5]", "{a} not in [0,1]", "{b} not in [0,1]"]
rdExp1 = RdExpression(form, cond) rdExp1 = RdExpression(form, cond)
print(rdExp1()) print(rdExp1())
rdExp2 = RdExpression(form)
print(rdExp2())