Menu
▾
▴
[Dmcs-notify] SF.net SVN: dmcs:[3316] dmcs/branches/dmcs1.5/examples/test
|
From: <mm...@us...> - 2013-01-05 07:42:16
|
Revision: 3316
http://dmcs.svn.sourceforge.net/dmcs/?rev=3316&view=rev
Author: mmsc
Date: 2013-01-05 07:42:09 +0000 (Sat, 05 Jan 2013)
Log Message:
-----------
Update data and scripts.
Modified Paths:
--------------
dmcs/branches/dmcs1.5/examples/test/data/ring.zip
dmcs/branches/dmcs1.5/examples/test/data/tree.zip
dmcs/branches/dmcs1.5/examples/test/tables.py
dmcs/branches/dmcs1.5/examples/test/tables.sh
Modified: dmcs/branches/dmcs1.5/examples/test/data/ring.zip
===================================================================
(Binary files differ)
Modified: dmcs/branches/dmcs1.5/examples/test/data/tree.zip
===================================================================
(Binary files differ)
Modified: dmcs/branches/dmcs1.5/examples/test/tables.py
===================================================================
--- dmcs/branches/dmcs1.5/examples/test/tables.py 2013-01-01 17:15:29 UTC (rev 3315)
+++ dmcs/branches/dmcs1.5/examples/test/tables.py 2013-01-05 07:42:09 UTC (rev 3316)
@@ -210,10 +210,20 @@
return outcomes, sorted_testcases
+def final_data_display(val):
+ if val == '1000124':
+ return '600'
+ elif val == '10001':
+ return 'E'
+ else:
+ return val
-def final_display(val):
+
+def final_table_display(val):
if val == '1000124':
return '---'
+ elif val == '1000134':
+ return 'M'
elif val == '10001':
return 'E'
else:
@@ -264,22 +274,22 @@
instance[2],
instance[3],
instance[4],
- final_display(outcome[0][0]),
- final_display(outcome[0][1]),
- final_display(outcome[1][0]),
- final_display(outcome[1][1]),
- final_display(outcome[2][0]),
- final_display(outcome[3][0]),
- final_display(outcome[4][0]),
+ final_table_display(outcome[0][0]),
+ final_table_display(outcome[0][1]),
+ final_table_display(outcome[1][0]),
+ final_table_display(outcome[1][1]),
+ final_table_display(outcome[2][0]),
+ final_table_display(outcome[3][0]),
+ final_table_display(outcome[4][0]),
outcome[4][1],
nice_display(outcome[5][0], outcome[5][1]),
- final_display(outcome[6][0]),
+ final_table_display(outcome[6][0]),
outcome[6][1],
nice_display(outcome[7][0], outcome[7][1]),
- final_display(outcome[8][0]),
+ final_table_display(outcome[8][0]),
outcome[8][1],
nice_display(outcome[9][0], outcome[9][1]),
- final_display(outcome[10][0]),
+ final_table_display(outcome[10][0]),
outcome[10][1],
nice_display(outcome[11][0], outcome[11][1])))
@@ -306,38 +316,71 @@
if not os.path.exists(path):
print "Make dir " + path
os.makedirs(path)
-
- with open(path + '/' + test_name + '.dat', 'w') as f:
- for i in range(len(outcomes)):
- outcome = outcomes[i]
- f.write(raw_row_template.format(final_display(outcome[0][0]),
- final_display(outcome[0][1]),
- final_display(outcome[1][0]),
- final_display(outcome[1][1]),
- final_display(outcome[2][0]),
- final_display(outcome[2][1]),
- final_display(outcome[3][0]),
- final_display(outcome[3][1]),
- final_display(outcome[4][0]),
- final_display(outcome[4][1]),
- final_display(outcome[5][0]),
- final_display(outcome[5][1]),
- final_display(outcome[6][0]),
- final_display(outcome[6][1]),
- final_display(outcome[7][0]),
- final_display(outcome[7][1]),
- final_display(outcome[8][0]),
- final_display(outcome[8][1]),
- final_display(outcome[9][0]),
- final_display(outcome[9][1]),
- final_display(outcome[10][0]),
- final_display(outcome[10][1]),
- final_display(outcome[11][0]),
- final_display(outcome[11][1])
- ))
- f.closed
+ cdoutput = 'condenseoutput';
+ if not os.path.exists(cdoutput):
+ print "Make dir " + cdoutput
+ os.makedirs(cdoutput)
+ with open(cdoutput + '/' + test_name + '.dat', 'w') as f1:
+ with open(path + '/' + test_name + '.dat', 'w') as f:
+ for i in range(len(outcomes)):
+ outcome = outcomes[i]
+ f.write(raw_row_template.format(final_data_display(outcome[0][0]),
+ final_data_display(outcome[0][1]),
+ final_data_display(outcome[1][0]),
+ final_data_display(outcome[1][1]),
+ final_data_display(outcome[2][0]),
+ final_data_display(outcome[2][1]),
+ final_data_display(outcome[3][0]),
+ final_data_display(outcome[3][1]),
+ final_data_display(outcome[4][0]),
+ final_data_display(outcome[4][1]),
+ final_data_display(outcome[5][0]),
+ final_data_display(outcome[5][1]),
+ final_data_display(outcome[6][0]),
+ final_data_display(outcome[6][1]),
+ final_data_display(outcome[7][0]),
+ final_data_display(outcome[7][1]),
+ final_data_display(outcome[8][0]),
+ final_data_display(outcome[8][1]),
+ final_data_display(outcome[9][0]),
+ final_data_display(outcome[9][1]),
+ final_data_display(outcome[10][0]),
+ final_data_display(outcome[10][1]),
+ final_data_display(outcome[11][0]),
+ final_data_display(outcome[11][1])
+ ))
+
+ f1.write(raw_row_template.format(final_data_display(outcome[0][0]),
+ final_data_display(outcome[0][1]),
+ final_data_display(outcome[1][0]),
+ final_data_display(outcome[1][1]),
+ final_data_display(outcome[2][0]),
+ final_data_display(outcome[2][1]),
+ final_data_display(outcome[3][0]),
+ final_data_display(outcome[3][1]),
+ final_data_display(outcome[4][0]),
+ final_data_display(outcome[4][1]),
+ final_data_display(outcome[5][0]),
+ final_data_display(outcome[5][1]),
+ final_data_display(outcome[6][0]),
+ final_data_display(outcome[6][1]),
+ final_data_display(outcome[7][0]),
+ final_data_display(outcome[7][1]),
+ final_data_display(outcome[8][0]),
+ final_data_display(outcome[8][1]),
+ final_data_display(outcome[9][0]),
+ final_data_display(outcome[9][1]),
+ final_data_display(outcome[10][0]),
+ final_data_display(outcome[10][1]),
+ final_data_display(outcome[11][0]),
+ final_data_display(outcome[11][1])
+ ))
+ f.closed
+ f1.closed
+
+
def main(argv):
parser = OptionParser()
parser.add_option("-i", "--inp", dest="inputext", help="extension of output instances", metavar="INP")
Modified: dmcs/branches/dmcs1.5/examples/test/tables.sh
===================================================================
--- dmcs/branches/dmcs1.5/examples/test/tables.sh 2013-01-01 17:15:29 UTC (rev 3315)
+++ dmcs/branches/dmcs1.5/examples/test/tables.sh 2013-01-05 07:42:09 UTC (rev 3316)
@@ -1,18 +1,21 @@
#!/bin/bash
-#TOPOLOGIES="tree diamond zigzag ring"
-TOPOLOGIES="diamond ring"
-INPUTEXT="out1 out2"
+TOPOLOGIES="tree diamond zigzag ring"
+INPUTEXT="out1 out2 out3"
echo "\begin{landscape}" > tables-all.tex
for topo in $TOPOLOGIES ; do
for inputext in $INPUTEXT ; do
- python tables.py --topo=$topo --inp=$inputext
- cat table-$topo-$inputext.tex >> tables-all.tex
- echo "" >> tables-all.tex
- echo "" >> tables-all.tex
- echo "" >> tables-all.tex
+ if [ ! -e config/$topo.$inputext ] ; then
+ echo Configuration $topo.$inputext does not exists. Going to ignore...
+ else
+ python tables.py --topo=$topo --inp=$inputext
+ cat table-$topo-$inputext.tex >> tables-all.tex
+ echo "" >> tables-all.tex
+ echo "" >> tables-all.tex
+ echo "" >> tables-all.tex
+ fi
done
done
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
