Skip to content
Snippets Groups Projects
Commit a37d0114 authored by ArktikHunter's avatar ArktikHunter
Browse files

added batch mode, got rid of weird seed list bug

parent 44579cfb
No related branches found
No related tags found
1 merge request!21pydtn agkmeans and version 1.0
This commit is part of merge request !21. Comments created here will be created in the context of that merge request.
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
__authors__ = 'Jarrod Pas <j.pas@usask.ca>, Hunter McConnell <hunter.mcconnell@usask.ca>' __authors__ = 'Jarrod Pas <j.pas@usask.ca>, Hunter McConnell <hunter.mcconnell@usask.ca>'
import os import os
from random import randint
import sys import sys
import csv import csv
from argparse import ArgumentParser from argparse import ArgumentParser
...@@ -78,12 +79,17 @@ def main(args): ...@@ -78,12 +79,17 @@ def main(args):
HCBFLouvainNode, HCBFLouvainNode,
] ]
for seed in args['seeds']: if args['batch'] > 1: # batch mode with random seeds
if seed is not None: for _ in range(args['batch']):
seed = seed[0] #hacky, gets rid of TypeError: unhashable type: 'list' seed = randint(0, 500)
for node_type in node_types: for node_type in node_types:
sim = Simulation(trace=trace, node_type=node_type, seed=seed) sim = Simulation(trace=trace, node_type=node_type, seed=seed)
simulations.append(sim) 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 = {} results = {}
...@@ -117,8 +123,10 @@ def parse_args(args): ...@@ -117,8 +123,10 @@ def parse_args(args):
parser.add_argument('shed') parser.add_argument('shed')
parser.add_argument('--pretty', action='store_true') parser.add_argument('--pretty', action='store_true')
parser.add_argument('--quiet', '-q', 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', 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) args = parser.parse_args(args)
return vars(args) return vars(args)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment