Browse Source

Update model to prevent stripping of list of length 1

Yentl Van Tendeloo 9 years ago
parent
commit
f53246619b
2 changed files with 4 additions and 7 deletions
  1. 1 1
      kernel/modelverse_kernel/main.py
  2. 3 6
      model/model.py

+ 1 - 1
kernel/modelverse_kernel/main.py

@@ -64,7 +64,7 @@ class ModelverseKernel(object):
             elif inst_v is None:
                 raise Exception("%s: error understanding command (%s, %s)" % (self.debug_info, inst_v, phase_v))
             else:
-                print("%-30s(%s)" % (inst_v["value"], phase_v))
+                #print("%-30s(%s) -- %s" % (inst_v["value"], phase_v, username))
                 gen = getattr(self, "%s_%s" % (inst_v["value"], phase_v))(user_root)
         elif inst_v is None:
             raise Exception("%s: error understanding command (%s, %s)" % (self.debug_info, inst_v, phase_v))

+ 3 - 6
model/model.py

@@ -176,10 +176,7 @@ class ModelverseKernel(AtomicDEVS):
                     self.state.root = mvs_stripped[0]
                     self.state.mvk = MvK(self.state.root)
                 else:
-                    if len(mvs_stripped) == 1:
-                        self.state.reply = mvs_stripped[0]
-                    else:
-                        self.state.reply = mvs_stripped
+                    self.state.reply = mvs_stripped
             self.state.waiting = False
 
         return self.state
@@ -498,6 +495,6 @@ args = {
 
 model = System(**args)
 sim = Simulator(model)
-sim.setTerminationTime(20000)
-sim.setVerbose()
+sim.setTerminationTime(90000)
+#sim.setVerbose()
 sim.simulate()