[Dmcs-notify] SF.net SVN: dmcs:[3310] dmcs/branches/dmcs1.5/examples/test

[<mm...@us...>]

Revision: 3310
          http://dmcs.svn.sourceforge.net/dmcs/?rev=3310&view=rev
Author:   mmsc
Date:     2012-12-10 10:18:53 +0000 (Mon, 10 Dec 2012)
Log Message:
-----------
Change output ordering.

Modified Paths:
--------------
    dmcs/branches/dmcs1.5/examples/test/config/diamond.out1
    dmcs/branches/dmcs1.5/examples/test/config/diamond.out2
    dmcs/branches/dmcs1.5/examples/test/config/ring.out1
    dmcs/branches/dmcs1.5/examples/test/config/ring.out2
    dmcs/branches/dmcs1.5/examples/test/listTests.py

Modified: dmcs/branches/dmcs1.5/examples/test/config/diamond.out1
===================================================================
--- dmcs/branches/dmcs1.5/examples/test/config/diamond.out1	2012-12-10 09:57:14 UTC (rev 3309)
+++ dmcs/branches/dmcs1.5/examples/test/config/diamond.out1	2012-12-10 10:18:53 UTC (rev 3310)
@@ -3,28 +3,28 @@
 1,4,10,5,5,c
 1,4,10,5,5,d
 1,4,10,5,5,e
-1,4,20,10,10,a
-1,4,20,10,10,b
-1,4,20,10,10,c
-1,4,20,10,10,d
-1,4,20,10,10,e
 1,7,10,5,5,a
 1,7,10,5,5,b
 1,7,10,5,5,c
 1,7,10,5,5,d
 1,7,10,5,5,e
-1,7,20,10,10,a
-1,7,20,10,10,b
-1,7,20,10,10,c
-1,7,20,10,10,d
-1,7,20,10,10,e
 1,10,10,5,5,a
 1,10,10,5,5,b
 1,10,10,5,5,c
 1,10,10,5,5,d
 1,10,10,5,5,e
-1,10,20,10,10,a
-1,10,20,10,10,b
-1,10,20,10,10,c
-1,10,20,10,10,d
-1,10,20,10,10,e
+1,13,10,5,5,a
+1,13,10,5,5,b
+1,13,10,5,5,c
+1,13,10,5,5,d
+1,13,10,5,5,e
+1,25,10,5,5,a
+1,25,10,5,5,b
+1,25,10,5,5,c
+1,25,10,5,5,d
+1,25,10,5,5,e
+1,31,10,5,5,a
+1,31,10,5,5,b
+1,31,10,5,5,c
+1,31,10,5,5,d
+1,31,10,5,5,e

Modified: dmcs/branches/dmcs1.5/examples/test/config/diamond.out2
===================================================================
--- dmcs/branches/dmcs1.5/examples/test/config/diamond.out2	2012-12-10 09:57:14 UTC (rev 3309)
+++ dmcs/branches/dmcs1.5/examples/test/config/diamond.out2	2012-12-10 10:18:53 UTC (rev 3310)
@@ -1,28 +1,28 @@
-1,13,10,5,5,a
-1,13,10,5,5,b
-1,13,10,5,5,c
-1,13,10,5,5,d
-1,13,10,5,5,e
+1,4,20,10,10,a
+1,4,20,10,10,b
+1,4,20,10,10,c
+1,4,20,10,10,d
+1,4,20,10,10,e
+1,7,20,10,10,a
+1,7,20,10,10,b
+1,7,20,10,10,c
+1,7,20,10,10,d
+1,7,20,10,10,e
+1,10,20,10,10,a
+1,10,20,10,10,b
+1,10,20,10,10,c
+1,10,20,10,10,d
+1,10,20,10,10,e
 1,13,20,10,10,a
 1,13,20,10,10,b
 1,13,20,10,10,c
 1,13,20,10,10,d
 1,13,20,10,10,e
-1,25,10,5,5,a
-1,25,10,5,5,b
-1,25,10,5,5,c
-1,25,10,5,5,d
-1,25,10,5,5,e
 1,25,20,10,10,a
 1,25,20,10,10,b
 1,25,20,10,10,c
 1,25,20,10,10,d
 1,25,20,10,10,e
-1,31,10,5,5,a
-1,31,10,5,5,b
-1,31,10,5,5,c
-1,31,10,5,5,d
-1,31,10,5,5,e
 1,31,20,10,10,a
 1,31,20,10,10,b
 1,31,20,10,10,c

Modified: dmcs/branches/dmcs1.5/examples/test/config/ring.out1
===================================================================
--- dmcs/branches/dmcs1.5/examples/test/config/ring.out1	2012-12-10 09:57:14 UTC (rev 3309)
+++ dmcs/branches/dmcs1.5/examples/test/config/ring.out1	2012-12-10 10:18:53 UTC (rev 3310)
@@ -3,29 +3,25 @@
 4,4,10,5,5,c
 4,4,10,5,5,d
 4,4,10,5,5,e
-4,4,20,10,10,a
-4,4,20,10,10,b
-4,4,20,10,10,c
-4,4,20,10,10,d
-4,4,20,10,10,e
 4,7,10,5,5,a
 4,7,10,5,5,b
 4,7,10,5,5,c
 4,7,10,5,5,d
 4,7,10,5,5,e
-4,7,20,10,10,a
-4,7,20,10,10,b
-4,7,20,10,10,c
-4,7,20,10,10,d
-4,7,20,10,10,e
 4,10,10,5,5,a
 4,10,10,5,5,b
 4,10,10,5,5,c
 4,10,10,5,5,d
 4,10,10,5,5,e
-4,10,20,10,10,a
-4,10,20,10,10,b
-4,10,20,10,10,c
-4,10,20,10,10,d
-4,10,20,10,10,e
+4,13,10,5,5,a
+4,13,10,5,5,b
+4,13,10,5,5,c
+4,13,10,5,5,d
+4,13,10,5,5,e
+4,70,10,5,5,a
+4,70,10,5,5,b
+4,70,10,5,5,c
+4,70,10,5,5,d
+4,70,10,5,5,e
 
+

Modified: dmcs/branches/dmcs1.5/examples/test/config/ring.out2
===================================================================
--- dmcs/branches/dmcs1.5/examples/test/config/ring.out2	2012-12-10 09:57:14 UTC (rev 3309)
+++ dmcs/branches/dmcs1.5/examples/test/config/ring.out2	2012-12-10 10:18:53 UTC (rev 3310)
@@ -1,18 +1,23 @@
-4,13,10,5,5,a
-4,13,10,5,5,b
-4,13,10,5,5,c
-4,13,10,5,5,d
-4,13,10,5,5,e
+4,4,20,10,10,a
+4,4,20,10,10,b
+4,4,20,10,10,c
+4,4,20,10,10,d
+4,4,20,10,10,e
+4,7,20,10,10,a
+4,7,20,10,10,b
+4,7,20,10,10,c
+4,7,20,10,10,d
+4,7,20,10,10,e
+4,10,20,10,10,a
+4,10,20,10,10,b
+4,10,20,10,10,c
+4,10,20,10,10,d
+4,10,20,10,10,e
 4,13,20,10,10,a
 4,13,20,10,10,b
 4,13,20,10,10,c
 4,13,20,10,10,d
 4,13,20,10,10,e
-4,70,10,5,5,a
-4,70,10,5,5,b
-4,70,10,5,5,c
-4,70,10,5,5,d
-4,70,10,5,5,e
 4,70,20,10,10,a
 4,70,20,10,10,b
 4,70,20,10,10,c

Modified: dmcs/branches/dmcs1.5/examples/test/listTests.py
===================================================================
--- dmcs/branches/dmcs1.5/examples/test/listTests.py	2012-12-10 09:57:14 UTC (rev 3309)
+++ dmcs/branches/dmcs1.5/examples/test/listTests.py	2012-12-10 10:18:53 UTC (rev 3310)
@@ -3,35 +3,46 @@
 import getopt, sys
 import optparse
 import string
+from optparse import OptionParser
 
 def main(argv):
-    toponames      = ['diamond', 'tree', 'zigzag', 'ring']
-    topo_ids       = [ 1, 6, 3, 4 ]
-    system_sizes   = [[4],  # diamond
-                      [4], # tree
-                      [4],  # zigzag
-                      [4]  # ring
-                     ]
+    parser = OptionParser()
+    parser.add_option("-e", "--ext", dest="extension",
+                      help="write configuration with extension EXT", metavar="EXT")
 
-    toponames      = ['diamond']
-    topo_ids       = [ 1, 6, 3, 4 ]
-    system_sizes   = [[4],  # diamond
-                      [4], # tree
-                      [4],  # zigzag
-                      [4]  # ring
-                      ]
+    (options, args) = parser.parse_args()
 
-    no_atoms       = [9 ]
-    no_interface   = [ 5 ]
-    no_bridgerules = [ 5 ]
-    instances      = [ 'a', 'b' ]
+    extension = options.extension
+
+    #toponames      = ['diamond', 'tree', 'zigzag', 'ring']
+    #topo_ids       = [ 1, 6, 3, 4 ]
+    #system_sizes   = [[4],  # diamond
+    #                  [4], # tree
+    #                  [4],  # zigzag
+    #                  [4]  # ring
+    #                 ]
+
+    toponames      = ['ring']
+    topo_ids       = [ 4 ]
+    system_sizes   = [[4, 7, 10, 13, 70]]
+
+    #toponames      = ['diamond']
+    #topo_ids       = [ 1 ]
+    #system_sizes   = [[4, 7, 10, 13, 25, 31]]
+
+    
+    no_atoms       = [ 10, 20 ]
+    no_interface   = [ 5,  10 ]
+    no_bridgerules = [ 5,  10 ]
     #instances      = [ 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' ]
+    instances      = [ 'a', 'b', 'c', 'd', 'e' ]
+    
 
     for i in range(0,len(toponames)):
-        filename = 'config/' + toponames[i] + '.cfg'
+        filename = 'config/' + toponames[i] + '.' + extension
         with open(filename, 'w') as f:
-            for j in range(0,len(system_sizes[i])):
-                for k in range(0,len(no_atoms)):
+            for k in range(0,len(no_atoms)):
+                for j in range(0,len(system_sizes[i])):
                     for ins in range(0,len(instances)):
                         tmp = str(topo_ids[i]) + ',' + str(system_sizes[i][j]) + ',' + str(no_atoms[k]) + ',' + str(no_interface[k]) + ',' + str(no_bridgerules[k]) + ',' + instances[ins] + '\n'
                         f.write(tmp)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.