pydtn agkmeans and version 1.0

Fatemeh's agkmeans, basic gui, prophet Version used for paper

examples/shed.py

@@ -3,6 +3,7 @@
 __authors__ = 'Jarrod Pas <j.pas@usask.ca>, Hunter McConnell <hunter.mcconnell@usask.ca>'
 
 import os
+from random import randint
 import sys
 import csv
 from argparse import ArgumentParser
@@ -78,12 +79,17 @@ def main(args):
         HCBFLouvainNode,
     ]
 
-    for seed in args['seeds']:
-        if seed is not None:
-            seed = seed[0]      #hacky, gets rid of TypeError: unhashable type: 'list'
-        for node_type in node_types:
-            sim = Simulation(trace=trace, node_type=node_type, seed=seed)
-            simulations.append(sim)
+    if args['batch'] > 1:               # batch mode with random seeds
+        for _ in range(args['batch']):
+            seed = randint(0, 500)
+            for node_type in node_types:
+                sim = Simulation(trace=trace, node_type=node_type, seed=seed)
+                simulations.append(sim)
+    else:
+        for seed in args['seeds']:      # seed mode with inputted seeds
+            for node_type in node_types:
+                sim = Simulation(trace=trace, node_type=node_type, seed=seed)
+                simulations.append(sim)
 
     results = {}
 
@@ -117,8 +123,10 @@ def parse_args(args):
     parser.add_argument('shed')
     parser.add_argument('--pretty', action='store_true')
     parser.add_argument('--quiet', '-q', action='store_true')
+    parser.add_argument('--batch', '-b', 
+                        metavar='BATCH', type=int, default=1)
     parser.add_argument('--seeds', '-s',
-                        action='append', metavar='SEED', type=int, nargs='+', default=[None])
+                        action='append', metavar='SEED', type=int, default=[None])
 
     args = parser.parse_args(args)
     return vars(args)