diff --git a/n-vivace-satreach-cyber/c-ECApaths.py b/n-vivace-satreach-cyber/c-ECApaths.py
index dde0e427de8811225945ad0c76fe30402a85f5a7..eeda8ebfc1eea4adeb35ae8c35bfee56de4082f8 100644
--- a/n-vivace-satreach-cyber/c-ECApaths.py
+++ b/n-vivace-satreach-cyber/c-ECApaths.py
@@ -32,7 +32,7 @@ def runcmd(cmd):
cmdresult= os.system(cmd)
print("cmd:%s"%(cmd))
if cmdresult!=0 and cmdresult!=EXCEPTIONMINISAT:
- sys.exit("\nFATAL ERROR code:%d raised by script command:\n[%s"%(cmdresult,cmd))
+ sys.exit("\nFATAL ERROR code:%d raised by script command:\n[%s]]"%(cmdresult,cmd))
def extract(pattern,strToParse):
@@ -102,10 +102,10 @@ def runOne():
return analyseRes3(res3, hashx, hashy)
def runECA():
- filename="allSynth/synth-ECA%d-n%d-T%d.txt"%(ECA, N, TSTEPS)
+ filename="allSynth-N%d-T%d/synth-ECA%d-n%d-T%d.txt"%(N,TSTEPS,ECA, N, TSTEPS)
f=open(filename, FILE_SYNTHESIS_WRITEMODE)
for i in range(NSAMPLE):
- print("----%d----"%(i+1))
+ print("\n-- ECA: %d -- config : %d----"%(ECA,(i+1)))
output=runOne()
f.write(output+"\n")
f.close()
@@ -115,15 +115,7 @@ def runAllECA():
for ECA in ECAminimals:
runECA()
-
-
-def tstRE():
- res3="restarts : 445"
- srch=re.search("restarts\s+:\s+(\d+)", res3)
- if srch:
- print("goude:"+srch.group(1))
- else:
- print("ZZZ...\n[%s]"%res3.replace('\n',' '))
+############################## OLD
runAllECA()
diff --git a/n-vivace-satreach-cyber/e-sunthesis.py b/n-vivace-satreach-cyber/e-sunthesis.py
index 69d71d7c90410a1989ae0da1bb4473281572b35a..dbc55d260458d5150e69c3e861d93e6608f123fa 100644
--- a/n-vivace-satreach-cyber/e-sunthesis.py
+++ b/n-vivace-satreach-cyber/e-sunthesis.py
@@ -1,3 +1,5 @@
+import sys
+
# Building synthesis table
#######
ECAminimals=[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
@@ -8,7 +10,8 @@ ECAminimals=[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
138, 140, 142, 146, 150, 152, 154, 156, 160, 162, 164,
168, 170, 172, 178, 184, 200, 204, 232]
-N=30 ; Tsteps=70
+#N=0 ; Tsteps=0
+#N=30 ; Tsteps=70
# column indices
IREACH,ITIME= 1,2
@@ -32,20 +35,35 @@ def processData(data):
preach= float(sumreach) / float(NS)
detreach="(%d/%d)"%(sumreach,NS)
- return 'reached: %.2f %10s time:%.3f R: %3d C: %d D: %d P: %d'\
+ return '%.2f %9s %.3f %3d %5d %5d %6d'\
%(preach, detreach, sumtime, sr, sc, sd, sp)
-def readfile(ECA):
- filename= "allSynth/synth-ECA%d-n%d-T%d.txt"%(ECA,N,Tsteps)
+HEADER="ECA N T pR info time R C D P"
+
+def readoneECAfile(ECA):
+ filename= "allSynth-N%d-T%d/synth-ECA%d-n%d-T%d.txt"%(N,Tsteps,ECA,N,Tsteps)
f=open(filename)
dat=f.readlines()
- #print(dat)
strdat=processData(dat)
- print("%-3d %d %d %s"%( ECA, N, Tsteps, strdat ))
+ outputline="%-3d %d %d %s"%( ECA, N, Tsteps, strdat )
+ return outputline
def processAll():
+ filenameout= "z-kuberECA-N%d-T%d.csv"%(N,Tsteps)
+ f=open(filenameout,"w")
+ print(HEADER)
+ f.write(HEADER+"\n")
for eca in ECAminimals:
- readfile(eca)
+ outline= readoneECAfile(eca)
+ print(outline)
+ f.write(outline+"\n")
+ f.close
-processAll()
\ No newline at end of file
+##### MAIN
+if len(sys.argv) != 3:
+ print( "usage e-suntheis.py N T" )
+ sys.exit(-99)
+N=int(sys.argv[1])
+Tsteps=int(sys.argv[2])
+processAll()
diff --git a/n-vivace-satreach-cyber/makefile b/n-vivace-satreach-cyber/makefile
index fc15c12ad8db3fc9d4fcb1f3232bed1e9dc7096e..982bd69affeb4ef950b115b4567d89bb08f18edc 100644
--- a/n-vivace-satreach-cyber/makefile
+++ b/n-vivace-satreach-cyber/makefile
@@ -3,6 +3,8 @@ run:
klin:
rm -f *cnf *dat data/* allSynth/synth*txt
+synth:
+ python3 e-sunthesis.py > z-kuberECA-N30-T70.csv
#######OLD
gen:
diff --git a/n-vivace-satreach-cyber/varia/T-minimals-cmd.sh b/n-vivace-satreach-cyber/varia/T-minimals-cmd.sh
new file mode 100644
index 0000000000000000000000000000000000000000..ab5f0547d15d3e2e4359b1d7a85c05815a322c40
--- /dev/null
+++ b/n-vivace-satreach-cyber/varia/T-minimals-cmd.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 18 19 22 23 24 25 26 27 28 29 30 32 33 34 35 36 37 38 40 41 42 43 44 45 46 50 51 54 56 57 58 60 62 72 73 74 76 77 78 90 94 104 105 106 108 110 122 126 128 130 132 134 136 138 140 142 146 150 152 154 156 160 162 164 168 170 172 178 184 200 204 232
+do
+ echo "cat allSynth/synth-ECA$i-n30-T70.txt >> allSynth-N30-T70/synth-ECA$i-n30-T70.txt"
+done
diff --git a/n-vivace-satreach-cyber/varia/Tfusion.sh b/n-vivace-satreach-cyber/varia/Tfusion.sh
new file mode 100644
index 0000000000000000000000000000000000000000..ce1d7b44b8f7c8aa9f3becc1c428464e72fe4248
--- /dev/null
+++ b/n-vivace-satreach-cyber/varia/Tfusion.sh
@@ -0,0 +1,88 @@
+cat allSynth/synth-ECA0-n30-T70.txt >> allSynth-N30-T70/synth-ECA0-n30-T70.txt
+cat allSynth/synth-ECA1-n30-T70.txt >> allSynth-N30-T70/synth-ECA1-n30-T70.txt
+cat allSynth/synth-ECA2-n30-T70.txt >> allSynth-N30-T70/synth-ECA2-n30-T70.txt
+cat allSynth/synth-ECA3-n30-T70.txt >> allSynth-N30-T70/synth-ECA3-n30-T70.txt
+cat allSynth/synth-ECA4-n30-T70.txt >> allSynth-N30-T70/synth-ECA4-n30-T70.txt
+cat allSynth/synth-ECA5-n30-T70.txt >> allSynth-N30-T70/synth-ECA5-n30-T70.txt
+cat allSynth/synth-ECA6-n30-T70.txt >> allSynth-N30-T70/synth-ECA6-n30-T70.txt
+cat allSynth/synth-ECA7-n30-T70.txt >> allSynth-N30-T70/synth-ECA7-n30-T70.txt
+cat allSynth/synth-ECA8-n30-T70.txt >> allSynth-N30-T70/synth-ECA8-n30-T70.txt
+cat allSynth/synth-ECA9-n30-T70.txt >> allSynth-N30-T70/synth-ECA9-n30-T70.txt
+cat allSynth/synth-ECA10-n30-T70.txt >> allSynth-N30-T70/synth-ECA10-n30-T70.txt
+cat allSynth/synth-ECA11-n30-T70.txt >> allSynth-N30-T70/synth-ECA11-n30-T70.txt
+cat allSynth/synth-ECA12-n30-T70.txt >> allSynth-N30-T70/synth-ECA12-n30-T70.txt
+cat allSynth/synth-ECA13-n30-T70.txt >> allSynth-N30-T70/synth-ECA13-n30-T70.txt
+cat allSynth/synth-ECA14-n30-T70.txt >> allSynth-N30-T70/synth-ECA14-n30-T70.txt
+cat allSynth/synth-ECA15-n30-T70.txt >> allSynth-N30-T70/synth-ECA15-n30-T70.txt
+cat allSynth/synth-ECA18-n30-T70.txt >> allSynth-N30-T70/synth-ECA18-n30-T70.txt
+cat allSynth/synth-ECA19-n30-T70.txt >> allSynth-N30-T70/synth-ECA19-n30-T70.txt
+cat allSynth/synth-ECA22-n30-T70.txt >> allSynth-N30-T70/synth-ECA22-n30-T70.txt
+cat allSynth/synth-ECA23-n30-T70.txt >> allSynth-N30-T70/synth-ECA23-n30-T70.txt
+cat allSynth/synth-ECA24-n30-T70.txt >> allSynth-N30-T70/synth-ECA24-n30-T70.txt
+cat allSynth/synth-ECA25-n30-T70.txt >> allSynth-N30-T70/synth-ECA25-n30-T70.txt
+cat allSynth/synth-ECA26-n30-T70.txt >> allSynth-N30-T70/synth-ECA26-n30-T70.txt
+cat allSynth/synth-ECA27-n30-T70.txt >> allSynth-N30-T70/synth-ECA27-n30-T70.txt
+cat allSynth/synth-ECA28-n30-T70.txt >> allSynth-N30-T70/synth-ECA28-n30-T70.txt
+cat allSynth/synth-ECA29-n30-T70.txt >> allSynth-N30-T70/synth-ECA29-n30-T70.txt
+cat allSynth/synth-ECA30-n30-T70.txt >> allSynth-N30-T70/synth-ECA30-n30-T70.txt
+cat allSynth/synth-ECA32-n30-T70.txt >> allSynth-N30-T70/synth-ECA32-n30-T70.txt
+cat allSynth/synth-ECA33-n30-T70.txt >> allSynth-N30-T70/synth-ECA33-n30-T70.txt
+cat allSynth/synth-ECA34-n30-T70.txt >> allSynth-N30-T70/synth-ECA34-n30-T70.txt
+cat allSynth/synth-ECA35-n30-T70.txt >> allSynth-N30-T70/synth-ECA35-n30-T70.txt
+cat allSynth/synth-ECA36-n30-T70.txt >> allSynth-N30-T70/synth-ECA36-n30-T70.txt
+cat allSynth/synth-ECA37-n30-T70.txt >> allSynth-N30-T70/synth-ECA37-n30-T70.txt
+cat allSynth/synth-ECA38-n30-T70.txt >> allSynth-N30-T70/synth-ECA38-n30-T70.txt
+cat allSynth/synth-ECA40-n30-T70.txt >> allSynth-N30-T70/synth-ECA40-n30-T70.txt
+cat allSynth/synth-ECA41-n30-T70.txt >> allSynth-N30-T70/synth-ECA41-n30-T70.txt
+cat allSynth/synth-ECA42-n30-T70.txt >> allSynth-N30-T70/synth-ECA42-n30-T70.txt
+cat allSynth/synth-ECA43-n30-T70.txt >> allSynth-N30-T70/synth-ECA43-n30-T70.txt
+cat allSynth/synth-ECA44-n30-T70.txt >> allSynth-N30-T70/synth-ECA44-n30-T70.txt
+cat allSynth/synth-ECA45-n30-T70.txt >> allSynth-N30-T70/synth-ECA45-n30-T70.txt
+cat allSynth/synth-ECA46-n30-T70.txt >> allSynth-N30-T70/synth-ECA46-n30-T70.txt
+cat allSynth/synth-ECA50-n30-T70.txt >> allSynth-N30-T70/synth-ECA50-n30-T70.txt
+cat allSynth/synth-ECA51-n30-T70.txt >> allSynth-N30-T70/synth-ECA51-n30-T70.txt
+cat allSynth/synth-ECA54-n30-T70.txt >> allSynth-N30-T70/synth-ECA54-n30-T70.txt
+cat allSynth/synth-ECA56-n30-T70.txt >> allSynth-N30-T70/synth-ECA56-n30-T70.txt
+cat allSynth/synth-ECA57-n30-T70.txt >> allSynth-N30-T70/synth-ECA57-n30-T70.txt
+cat allSynth/synth-ECA58-n30-T70.txt >> allSynth-N30-T70/synth-ECA58-n30-T70.txt
+cat allSynth/synth-ECA60-n30-T70.txt >> allSynth-N30-T70/synth-ECA60-n30-T70.txt
+cat allSynth/synth-ECA62-n30-T70.txt >> allSynth-N30-T70/synth-ECA62-n30-T70.txt
+cat allSynth/synth-ECA72-n30-T70.txt >> allSynth-N30-T70/synth-ECA72-n30-T70.txt
+cat allSynth/synth-ECA73-n30-T70.txt >> allSynth-N30-T70/synth-ECA73-n30-T70.txt
+cat allSynth/synth-ECA74-n30-T70.txt >> allSynth-N30-T70/synth-ECA74-n30-T70.txt
+cat allSynth/synth-ECA76-n30-T70.txt >> allSynth-N30-T70/synth-ECA76-n30-T70.txt
+cat allSynth/synth-ECA77-n30-T70.txt >> allSynth-N30-T70/synth-ECA77-n30-T70.txt
+cat allSynth/synth-ECA78-n30-T70.txt >> allSynth-N30-T70/synth-ECA78-n30-T70.txt
+cat allSynth/synth-ECA90-n30-T70.txt >> allSynth-N30-T70/synth-ECA90-n30-T70.txt
+cat allSynth/synth-ECA94-n30-T70.txt >> allSynth-N30-T70/synth-ECA94-n30-T70.txt
+cat allSynth/synth-ECA104-n30-T70.txt >> allSynth-N30-T70/synth-ECA104-n30-T70.txt
+cat allSynth/synth-ECA105-n30-T70.txt >> allSynth-N30-T70/synth-ECA105-n30-T70.txt
+cat allSynth/synth-ECA106-n30-T70.txt >> allSynth-N30-T70/synth-ECA106-n30-T70.txt
+cat allSynth/synth-ECA108-n30-T70.txt >> allSynth-N30-T70/synth-ECA108-n30-T70.txt
+cat allSynth/synth-ECA110-n30-T70.txt >> allSynth-N30-T70/synth-ECA110-n30-T70.txt
+cat allSynth/synth-ECA122-n30-T70.txt >> allSynth-N30-T70/synth-ECA122-n30-T70.txt
+cat allSynth/synth-ECA126-n30-T70.txt >> allSynth-N30-T70/synth-ECA126-n30-T70.txt
+cat allSynth/synth-ECA128-n30-T70.txt >> allSynth-N30-T70/synth-ECA128-n30-T70.txt
+cat allSynth/synth-ECA130-n30-T70.txt >> allSynth-N30-T70/synth-ECA130-n30-T70.txt
+cat allSynth/synth-ECA132-n30-T70.txt >> allSynth-N30-T70/synth-ECA132-n30-T70.txt
+cat allSynth/synth-ECA134-n30-T70.txt >> allSynth-N30-T70/synth-ECA134-n30-T70.txt
+cat allSynth/synth-ECA136-n30-T70.txt >> allSynth-N30-T70/synth-ECA136-n30-T70.txt
+cat allSynth/synth-ECA138-n30-T70.txt >> allSynth-N30-T70/synth-ECA138-n30-T70.txt
+cat allSynth/synth-ECA140-n30-T70.txt >> allSynth-N30-T70/synth-ECA140-n30-T70.txt
+cat allSynth/synth-ECA142-n30-T70.txt >> allSynth-N30-T70/synth-ECA142-n30-T70.txt
+cat allSynth/synth-ECA146-n30-T70.txt >> allSynth-N30-T70/synth-ECA146-n30-T70.txt
+cat allSynth/synth-ECA150-n30-T70.txt >> allSynth-N30-T70/synth-ECA150-n30-T70.txt
+cat allSynth/synth-ECA152-n30-T70.txt >> allSynth-N30-T70/synth-ECA152-n30-T70.txt
+cat allSynth/synth-ECA154-n30-T70.txt >> allSynth-N30-T70/synth-ECA154-n30-T70.txt
+cat allSynth/synth-ECA156-n30-T70.txt >> allSynth-N30-T70/synth-ECA156-n30-T70.txt
+cat allSynth/synth-ECA160-n30-T70.txt >> allSynth-N30-T70/synth-ECA160-n30-T70.txt
+cat allSynth/synth-ECA162-n30-T70.txt >> allSynth-N30-T70/synth-ECA162-n30-T70.txt
+cat allSynth/synth-ECA164-n30-T70.txt >> allSynth-N30-T70/synth-ECA164-n30-T70.txt
+cat allSynth/synth-ECA168-n30-T70.txt >> allSynth-N30-T70/synth-ECA168-n30-T70.txt
+cat allSynth/synth-ECA170-n30-T70.txt >> allSynth-N30-T70/synth-ECA170-n30-T70.txt
+cat allSynth/synth-ECA172-n30-T70.txt >> allSynth-N30-T70/synth-ECA172-n30-T70.txt
+cat allSynth/synth-ECA178-n30-T70.txt >> allSynth-N30-T70/synth-ECA178-n30-T70.txt
+cat allSynth/synth-ECA184-n30-T70.txt >> allSynth-N30-T70/synth-ECA184-n30-T70.txt
+cat allSynth/synth-ECA200-n30-T70.txt >> allSynth-N30-T70/synth-ECA200-n30-T70.txt
+cat allSynth/synth-ECA204-n30-T70.txt >> allSynth-N30-T70/synth-ECA204-n30-T70.txt
+cat allSynth/synth-ECA232-n30-T70.txt >> allSynth-N30-T70/synth-ECA232-n30-T70.txt
diff --git a/n-vivace-satreach-cyber/varia/t-minimals-a.txt b/n-vivace-satreach-cyber/varia/t-minimals-a.txt
new file mode 100644
index 0000000000000000000000000000000000000000..bc8dbb7001c49dd9144c74f40d0cb07f890eb932
--- /dev/null
+++ b/n-vivace-satreach-cyber/varia/t-minimals-a.txt
@@ -0,0 +1 @@
+0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 18 19 22 23 24 25 26 27 28 29 30 32 33 34 35 36 37 38 40 41 42 43 44 45 46 50 51 54 56 57 58 60 62 72 73 74 76 77 78 90 94 104 105 106 108 110 122 126 128 130 132 134 136 138 140 142 146 150 152 154 156 160 162 164 168 170 172 178 184 200 204 232
diff --git a/n-vivace-satreach-cyber/varia/zzz-remains.py b/n-vivace-satreach-cyber/varia/zzz-remains.py
index 6477381d02fa8d356a5959ad14d734b50553fe51..00c8c3e3c57516b3ebb8f5f89d39803d52f4ce00 100644
--- a/n-vivace-satreach-cyber/varia/zzz-remains.py
+++ b/n-vivace-satreach-cyber/varia/zzz-remains.py
@@ -1,3 +1,10 @@
+def tstRE():
+ res3="restarts : 445"
+ srch=re.search("restarts\s+:\s+(\d+)", res3)
+ if srch:
+ print("goude:"+srch.group(1))
+ else:
+ print("ZZZ...\n[%s]"%res3.replace('\n',' '))
def tr(sconfig):