From 17add3571930b659961e4b63c5cc49e6563c3ef7 Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Fri, 24 Apr 2020 17:34:59 +0200
Subject: [PATCH] Generalize AUTO generation somewhat
---
robotlab_safety/pluto_auto.py | 4 ++--
robotlab_safety/safety_2020.sps | Bin 32816 -> 33188 bytes
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/robotlab_safety/pluto_auto.py b/robotlab_safety/pluto_auto.py
index 957400d..03bc043 100755
--- a/robotlab_safety/pluto_auto.py
+++ b/robotlab_safety/pluto_auto.py
@@ -17,11 +17,11 @@ class PlutoVariables:
pass
def codegen(self, expr):
- m = re.match('([^=]+)=ALL\((.*)\)', expr)
+ m = re.match('([^=]+)=AND\{(.*),(.*)\}', expr)
if m:
lh = m.group(1)
regexp = m.group(2).replace('*', '.*')
- rh = [ "(%s+/SM_Pluto%d_Present)" % (v, self.by_name[v][0])
+ rh = [ m.group(3).format(v, pluto=self.by_name[v][0])
for v in self.by_name if re.match(regexp, v)]
return("%s=%s" % (lh, '*'.join(rh)))
raise Exception('Invalid expression', expr)
diff --git a/robotlab_safety/safety_2020.sps b/robotlab_safety/safety_2020.sps
index 7ee861e384be87ed526625908edb6a07297f758e..5ac0785b586730b4a0c9ae1d60b27a3ed36e3fdd 100644
GIT binary patch
delta 545
zcmdncz_g^9X~PRyWj_WNhH8cY1}%no249AF23Lk)h7yK+h5`m11`UR41_OrL$%cud
ziq#AS3^@#?V7Xd`c!mImB8F6kVun<PJcbemO@`XZ{qmBVW#pQau^O4kki(FJYNRSb
zBN=!ZxF#DGh)$j(BQn{*hh>th(B?mmN{m=-z~X2kZ8)ecI$1_eVsn;r6W?U5LY~b(
p0#ET1YX{+g*?c!~Cm$7!+gKpWXKI8JRkjR{3{;EA&A;nR839s7ccTCR
delta 133
zcmZ3|%(S6_X~PRyRv!i*293#$NurFJn;qq5D?<eyI*PJtGVn5RP2N~9y4lakhY>2#
ym?S#MO=>fb%PhXh2UvMFZwflakC0;2+<Y}@Cm)Ky^Fmp^$u)&SD1!M7ri=hcP$xG4
--
GitLab