Browse Source

Removed some prints

Yentl Van Tendeloo 9 years ago
parent
commit
583decdf43
2 changed files with 3 additions and 8 deletions
  1. 1 1
      kernel/modelverse_kernel/main.py
  2. 2 7
      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)" % (inst_v["value"], phase_v))
                 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))

+ 2 - 7
model/model.py

@@ -91,7 +91,6 @@ class ModelverseState(AtomicDEVS):
             # And already compute the result so it is ready to output
             self.state.output = []
             self.state.timer = 0.0
-            print("Got input: " + str(inputs[self.from_mvk]))
             for v in self.state.queue[0]:
                 self.state.output.append(getattr(self.state.mvs, translate(v[0]))(*v[1]))
                 self.state.timer += self.timings[translate(v[0])]()
@@ -178,10 +177,8 @@ class ModelverseKernel(AtomicDEVS):
                 else:
                     if len(mvs_stripped) == 1:
                         self.state.reply = mvs_stripped[0]
-                        print("Clip reply to " + str(mvs_stripped[0]))
                     else:
                         self.state.reply = mvs_stripped
-                        print("Set reply to " + str(mvs_stripped))
             self.state.waiting = False
 
         return self.state
@@ -217,8 +214,6 @@ class ModelverseKernel(AtomicDEVS):
                 # Process inputs
                 if self.state.inputs.get(self.state.current_user, None):
                     element_type, value = self.state.inputs[self.state.current_user][0]
-                    print(str((element_type, value)))
-                    print(self.state.reply)
                     commands = self.state.mvk.execute_yields(self.state.current_user, "set_input", [element_type, value], self.state.reply)
                     if commands is None:
                         self.state.inputs[self.state.current_user].pop(0)
@@ -494,6 +489,6 @@ args = {
 
 model = System(**args)
 sim = Simulator(model)
-sim.setTerminationTime(100)
-sim.setVerbose()
+sim.setTerminationTime(10000)
+#sim.setVerbose()
 sim.simulate()