Various CSG storage fixes

prism-tests/functionality/export/csg/aloha_backoff2.prism.export.auto

@@ -0,0 +1,11 @@
+# Export all model info
+
+-exportmodel aloha_backoff2.prism.all -ex
+
+# Export model info separately
+
+-exportmodel aloha_backoff2.prism.tra -ex
+# -exportmodel aloha_backoff2.prism.sta -ex
+# -exportmodel aloha_backoff2.prism.lab -ex
+# -exportmodel aloha_backoff2.prism.srew -ex
+# -exportmodel aloha_backoff2.prism.trew -ex

prism-tests/functionality/export/csg/aloha_backoff2.prism.lab

@@ -0,0 +1,2 @@
+0="init" 1="deadlock"
+0: 0

prism-tests/functionality/export/csg/aloha_backoff2.prism.srew

@@ -0,0 +1,154 @@
+# Reward structure "time"
+# State rewards
+214 151
+0 1
+1 1
+2 1
+5 1
+6 1
+7 1
+8 1
+9 1
+13 1
+14 1
+15 1
+16 1
+17 1
+18 1
+19 1
+20 1
+21 1
+22 1
+23 1
+24 1
+25 1
+26 1
+27 1
+28 1
+29 1
+30 1
+31 1
+32 1
+33 1
+34 1
+35 1
+36 1
+37 1
+41 1
+42 1
+43 1
+44 1
+45 1
+46 1
+47 1
+48 1
+49 1
+50 1
+51 1
+55 1
+56 1
+57 1
+58 1
+59 1
+60 1
+61 1
+62 1
+98 1
+99 1
+100 1
+101 1
+105 1
+106 1
+107 1
+108 1
+109 1
+110 1
+111 1
+112 1
+113 1
+114 1
+115 1
+116 1
+117 1
+118 1
+119 1
+120 1
+121 1
+122 1
+123 1
+124 1
+125 1
+126 1
+127 1
+128 1
+129 1
+130 1
+131 1
+132 1
+133 1
+134 1
+137 1
+138 1
+139 1
+140 1
+141 1
+142 1
+143 1
+144 1
+145 1
+146 1
+147 1
+148 1
+149 1
+153 1
+154 1
+155 1
+156 1
+157 1
+158 1
+159 1
+160 1
+161 1
+162 1
+163 1
+167 1
+168 1
+169 1
+170 1
+171 1
+172 1
+173 1
+174 1
+175 1
+176 1
+177 1
+178 1
+180 1
+181 1
+182 1
+183 1
+184 1
+185 1
+186 1
+187 1
+188 1
+189 1
+190 1
+194 1
+195 1
+196 1
+197 1
+198 1
+199 1
+200 1
+201 1
+202 1
+203 1
+204 1
+207 1
+208 1
+209 1
+210 1
+211 1
+212 1
+213 1

prism-tests/functionality/export/csg/aloha_backoff2.prism.sta

@@ -0,0 +1,215 @@
+(s1,tr1,bc1,cd1,t1,s2,tr2,bc2,cd2,t2,t)
+0:(0,0,0,0,0,0,0,0,0,0,0)
+1:(0,0,0,0,1,0,0,0,0,1,1)
+2:(0,0,0,0,1,0,0,0,1,0,1)
+3:(0,0,0,0,1,0,1,0,0,0,1)
+4:(0,0,0,0,1,1,0,0,1,0,1)
+5:(0,0,0,0,1,2,0,1,1,0,1)
+6:(0,0,0,0,1,3,0,0,0,0,1)
+7:(0,0,0,0,2,0,0,0,0,2,2)
+8:(0,0,0,0,2,0,0,0,1,0,2)
+9:(0,0,0,0,2,0,0,0,1,1,2)
+10:(0,0,0,0,2,0,1,0,0,0,2)
+11:(0,0,0,0,2,0,1,0,1,0,2)
+12:(0,0,0,0,2,1,0,0,1,0,2)
+13:(0,0,0,0,2,2,0,0,1,0,2)
+14:(0,0,0,0,2,2,0,1,1,0,2)
+15:(0,0,0,0,2,3,0,0,0,0,2)
+16:(0,0,0,0,2,3,0,0,0,1,2)
+17:(0,0,0,0,2,3,0,0,1,0,2)
+18:(0,0,0,1,0,0,0,0,0,1,1)
+19:(0,0,0,1,0,0,0,0,0,2,2)
+20:(0,0,0,1,0,0,0,0,1,0,1)
+21:(0,0,0,1,0,0,0,0,1,0,2)
+22:(0,0,0,1,0,0,0,0,1,1,2)
+23:(0,0,0,1,0,0,0,0,1,2,2)
+24:(0,0,0,1,0,2,0,0,1,0,2)
+25:(0,0,0,1,0,2,0,1,1,0,1)
+26:(0,0,0,1,0,2,0,1,1,0,2)
+27:(0,0,0,1,0,3,0,0,0,0,1)
+28:(0,0,0,1,0,3,0,0,0,0,2)
+29:(0,0,0,1,0,3,0,0,0,1,2)
+30:(0,0,0,1,0,3,0,0,0,2,2)
+31:(0,0,0,1,0,3,0,0,1,0,2)
+32:(0,0,0,1,0,3,0,0,1,1,2)
+33:(0,0,0,1,0,3,0,0,1,2,2)
+34:(0,0,0,1,1,0,0,0,0,2,2)
+35:(0,0,0,1,1,0,0,0,1,0,2)
+36:(0,0,0,1,1,0,0,0,1,1,2)
+37:(0,0,0,1,1,0,0,0,1,2,2)
+38:(0,0,0,1,1,0,1,0,0,0,2)
+39:(0,0,0,1,1,0,1,0,1,0,2)
+40:(0,0,0,1,1,1,0,0,1,0,2)
+41:(0,0,0,1,1,2,0,0,1,0,2)
+42:(0,0,0,1,1,2,0,1,1,0,2)
+43:(0,0,0,1,1,3,0,0,0,0,2)
+44:(0,0,0,1,1,3,0,0,0,1,2)
+45:(0,0,0,1,1,3,0,0,0,2,2)
+46:(0,0,0,1,1,3,0,0,1,0,2)
+47:(0,0,0,1,1,3,0,0,1,1,2)
+48:(0,0,0,1,1,3,0,0,1,2,2)
+49:(0,0,0,1,2,0,0,0,1,0,2)
+50:(0,0,0,1,2,0,0,0,1,1,2)
+51:(0,0,0,1,2,0,0,0,1,2,2)
+52:(0,0,0,1,2,0,1,0,0,0,2)
+53:(0,0,0,1,2,0,1,0,1,0,2)
+54:(0,0,0,1,2,1,0,0,1,0,2)
+55:(0,0,0,1,2,2,0,0,1,0,2)
+56:(0,0,0,1,2,2,0,1,1,0,2)
+57:(0,0,0,1,2,3,0,0,0,0,2)
+58:(0,0,0,1,2,3,0,0,0,1,2)
+59:(0,0,0,1,2,3,0,0,0,2,2)
+60:(0,0,0,1,2,3,0,0,1,0,2)
+61:(0,0,0,1,2,3,0,0,1,1,2)
+62:(0,0,0,1,2,3,0,0,1,2,2)
+63:(0,1,0,0,0,0,0,0,0,1,1)
+64:(0,1,0,0,0,0,0,0,0,2,2)
+65:(0,1,0,0,0,0,0,0,1,1,2)
+66:(0,1,0,0,0,0,0,0,1,2,2)
+67:(0,1,0,0,0,0,1,0,0,0,1)
+68:(0,1,0,0,0,0,1,0,0,0,2)
+69:(0,1,0,0,0,0,1,0,1,0,2)
+70:(0,1,0,0,0,2,0,0,1,0,2)
+71:(0,1,0,0,0,3,0,0,0,1,2)
+72:(0,1,0,0,0,3,0,0,0,2,2)
+73:(0,1,0,0,0,3,0,0,1,1,2)
+74:(0,1,0,1,0,0,0,0,0,2,2)
+75:(0,1,0,1,0,0,0,0,1,1,2)
+76:(0,1,0,1,0,0,0,0,1,2,2)
+77:(0,1,0,1,0,0,1,0,0,0,2)
+78:(0,1,0,1,0,0,1,0,1,0,2)
+79:(0,1,0,1,0,2,0,0,1,0,2)
+80:(0,1,0,1,0,3,0,0,0,1,2)
+81:(0,1,0,1,0,3,0,0,0,2,2)
+82:(0,1,0,1,0,3,0,0,1,1,2)
+83:(0,1,0,1,0,3,0,0,1,2,2)
+84:(1,0,0,1,0,0,0,0,0,1,1)
+85:(1,0,0,1,0,0,0,0,0,2,2)
+86:(1,0,0,1,0,0,0,0,1,1,2)
+87:(1,0,0,1,0,0,0,0,1,2,2)
+88:(1,0,0,1,0,1,0,0,1,0,1)
+89:(1,0,0,1,0,1,0,0,1,0,2)
+90:(1,0,0,1,0,2,0,0,1,0,2)
+91:(1,0,0,1,0,3,0,0,0,0,1)
+92:(1,0,0,1,0,3,0,0,0,0,2)
+93:(1,0,0,1,0,3,0,0,0,1,2)
+94:(1,0,0,1,0,3,0,0,0,2,2)
+95:(1,0,0,1,0,3,0,0,1,0,2)
+96:(1,0,0,1,0,3,0,0,1,1,2)
+97:(1,0,0,1,0,3,0,0,1,2,2)
+98:(2,0,0,1,0,0,0,0,0,2,2)
+99:(2,0,0,1,0,0,0,0,1,0,2)
+100:(2,0,0,1,0,0,0,0,1,1,2)
+101:(2,0,0,1,0,0,0,0,1,2,2)
+102:(2,0,0,1,0,0,1,0,0,0,2)
+103:(2,0,0,1,0,0,1,0,1,0,2)
+104:(2,0,0,1,0,1,0,0,1,0,2)
+105:(2,0,0,1,0,2,0,0,1,0,2)
+106:(2,0,0,1,0,2,0,1,1,0,2)
+107:(2,0,0,1,0,3,0,0,0,0,2)
+108:(2,0,0,1,0,3,0,0,0,1,2)
+109:(2,0,0,1,0,3,0,0,0,2,2)
+110:(2,0,0,1,0,3,0,0,1,0,2)
+111:(2,0,0,1,0,3,0,0,1,1,2)
+112:(2,0,0,1,0,3,0,0,1,2,2)
+113:(2,0,1,1,0,0,0,0,0,1,1)
+114:(2,0,1,1,0,0,0,0,0,2,2)
+115:(2,0,1,1,0,0,0,0,1,0,1)
+116:(2,0,1,1,0,0,0,0,1,0,2)
+117:(2,0,1,1,0,0,0,0,1,1,2)
+118:(2,0,1,1,0,0,0,0,1,2,2)
+119:(2,0,1,1,0,2,0,0,1,0,2)
+120:(2,0,1,1,0,2,0,1,1,0,1)
+121:(2,0,1,1,0,2,0,1,1,0,2)
+122:(2,0,1,1,0,3,0,0,0,0,1)
+123:(2,0,1,1,0,3,0,0,0,0,2)
+124:(2,0,1,1,0,3,0,0,0,1,2)
+125:(2,0,1,1,0,3,0,0,0,2,2)
+126:(2,0,1,1,0,3,0,0,1,0,2)
+127:(2,0,1,1,0,3,0,0,1,1,2)
+128:(2,0,1,1,0,3,0,0,1,2,2)
+129:(3,0,0,0,0,0,0,0,0,1,1)
+130:(3,0,0,0,0,0,0,0,0,2,2)
+131:(3,0,0,0,0,0,0,0,1,0,1)
+132:(3,0,0,0,0,0,0,0,1,0,2)
+133:(3,0,0,0,0,0,0,0,1,1,2)
+134:(3,0,0,0,0,0,0,0,1,2,2)
+135:(3,0,0,0,0,1,0,0,1,0,1)
+136:(3,0,0,0,0,1,0,0,1,0,2)
+137:(3,0,0,0,0,2,0,0,1,0,2)
+138:(3,0,0,0,0,2,0,1,1,0,1)
+139:(3,0,0,0,0,2,0,1,1,0,2)
+140:(3,0,0,0,0,3,0,0,0,0,1)
+141:(3,0,0,0,0,3,0,0,0,0,2)
+142:(3,0,0,0,0,3,0,0,0,1,2)
+143:(3,0,0,0,0,3,0,0,0,2,2)
+144:(3,0,0,0,0,3,0,0,1,0,2)
+145:(3,0,0,0,0,3,0,0,1,1,2)
+146:(3,0,0,0,1,0,0,0,0,2,2)
+147:(3,0,0,0,1,0,0,0,1,0,2)
+148:(3,0,0,0,1,0,0,0,1,1,2)
+149:(3,0,0,0,1,0,0,0,1,2,2)
+150:(3,0,0,0,1,0,1,0,0,0,2)
+151:(3,0,0,0,1,0,1,0,1,0,2)
+152:(3,0,0,0,1,1,0,0,1,0,2)
+153:(3,0,0,0,1,2,0,0,1,0,2)
+154:(3,0,0,0,1,2,0,1,1,0,2)
+155:(3,0,0,0,1,3,0,0,0,0,2)
+156:(3,0,0,0,1,3,0,0,0,1,2)
+157:(3,0,0,0,1,3,0,0,0,2,2)
+158:(3,0,0,0,1,3,0,0,1,0,2)
+159:(3,0,0,0,1,3,0,0,1,1,2)
+160:(3,0,0,0,1,3,0,0,1,2,2)
+161:(3,0,0,0,2,0,0,0,1,0,2)
+162:(3,0,0,0,2,0,0,0,1,1,2)
+163:(3,0,0,0,2,0,0,0,1,2,2)
+164:(3,0,0,0,2,0,1,0,0,0,2)
+165:(3,0,0,0,2,0,1,0,1,0,2)
+166:(3,0,0,0,2,1,0,0,1,0,2)
+167:(3,0,0,0,2,2,0,0,1,0,2)
+168:(3,0,0,0,2,2,0,1,1,0,2)
+169:(3,0,0,0,2,3,0,0,0,0,2)
+170:(3,0,0,0,2,3,0,0,0,1,2)
+171:(3,0,0,0,2,3,0,0,0,2,2)
+172:(3,0,0,0,2,3,0,0,1,0,2)
+173:(3,0,0,0,2,3,0,0,1,1,2)
+174:(3,0,0,0,2,3,0,0,1,2,2)
+175:(3,0,0,1,0,0,0,0,0,2,2)
+176:(3,0,0,1,0,0,0,0,1,0,2)
+177:(3,0,0,1,0,0,0,0,1,1,2)
+178:(3,0,0,1,0,0,0,0,1,2,2)
+179:(3,0,0,1,0,1,0,0,1,0,2)
+180:(3,0,0,1,0,2,0,0,1,0,2)
+181:(3,0,0,1,0,2,0,1,1,0,2)
+182:(3,0,0,1,0,3,0,0,0,0,2)
+183:(3,0,0,1,0,3,0,0,0,1,2)
+184:(3,0,0,1,0,3,0,0,0,2,2)
+185:(3,0,0,1,0,3,0,0,1,0,2)
+186:(3,0,0,1,0,3,0,0,1,1,2)
+187:(3,0,0,1,0,3,0,0,1,2,2)
+188:(3,0,0,1,1,0,0,0,1,0,2)
+189:(3,0,0,1,1,0,0,0,1,1,2)
+190:(3,0,0,1,1,0,0,0,1,2,2)
+191:(3,0,0,1,1,0,1,0,0,0,2)
+192:(3,0,0,1,1,0,1,0,1,0,2)
+193:(3,0,0,1,1,1,0,0,1,0,2)
+194:(3,0,0,1,1,2,0,0,1,0,2)
+195:(3,0,0,1,1,2,0,1,1,0,2)
+196:(3,0,0,1,1,3,0,0,0,0,2)
+197:(3,0,0,1,1,3,0,0,0,1,2)
+198:(3,0,0,1,1,3,0,0,0,2,2)
+199:(3,0,0,1,1,3,0,0,1,0,2)
+200:(3,0,0,1,1,3,0,0,1,1,2)
+201:(3,0,0,1,1,3,0,0,1,2,2)
+202:(3,0,0,1,2,0,0,0,1,0,2)
+203:(3,0,0,1,2,0,0,0,1,1,2)
+204:(3,0,0,1,2,0,0,0,1,2,2)
+205:(3,0,0,1,2,0,1,0,1,0,2)
+206:(3,0,0,1,2,1,0,0,1,0,2)
+207:(3,0,0,1,2,2,0,0,1,0,2)
+208:(3,0,0,1,2,2,0,1,1,0,2)
+209:(3,0,0,1,2,3,0,0,0,1,2)
+210:(3,0,0,1,2,3,0,0,0,2,2)
+211:(3,0,0,1,2,3,0,0,1,0,2)
+212:(3,0,0,1,2,3,0,0,1,1,2)
+213:(3,0,0,1,2,3,0,0,1,2,2)