Ver código fonte

Bugfixes wrt Ports and LCC

rparedis 3 anos atrás
pai
commit
c5af7370ba
2 arquivos alterados com 8 adições e 2 exclusões
  1. 1 1
      examples/scripts/BouncingBall/BouncingBall.py
  2. 7 1
      src/CBD/Core.py

+ 1 - 1
examples/scripts/BouncingBall/BouncingBall.py

@@ -25,7 +25,7 @@ class BouncingBall(CBD):
 		self.addConnection("y0", "y", input_port_name="IC")
 
 	def bounce(self):
-		v_pre = self.getSignalHistory("v")[-1].value
+		v_pre = self.getSignalHistory("velocity")[-1].value
 		v_new = -v_pre * self.k
 		self.getBlockByName("v0").setValue(v_new)
 		self.getBlockByName("y0").setValue(0.0)

+ 7 - 1
src/CBD/Core.py

@@ -793,8 +793,14 @@ class CBD(BaseBlock):
         return res
 
     def clearSignals(self):
+        """
+        Clears the output signals of all blocks and ports.
+        """
         for block in self.getBlocks():
-            block.clearSignals()
+            if isinstance(block, CBD):
+                block.clearSignals()
+            block.clearPorts()
+        self.clearPorts()
 
     def compute(self, curIteration):
         pass