|
|
@@ -42,22 +42,22 @@ class SpringMassDamper(CBD):
|
|
|
ConstantBlock("const5", 1),
|
|
|
]
|
|
|
for block in blocks:
|
|
|
- self.addBlock(block)
|
|
|
+ self.add_block(block)
|
|
|
|
|
|
- self.addConnection("const5", "prod1", output_port_name="OUT1", input_port_name="IN1")
|
|
|
- self.addConnection("const1", "prod1", output_port_name="OUT1", input_port_name="IN2")
|
|
|
- self.addConnection("prod1", "sum1", output_port_name="OUT1", input_port_name="IN1")
|
|
|
- self.addConnection("sum1", "int1", output_port_name="OUT1", input_port_name="IN1")
|
|
|
- self.addConnection("int1", "int2", output_port_name="OUT1", input_port_name="IN1")
|
|
|
- self.addConnection("int1", "prod2", output_port_name="OUT1", input_port_name="IN1")
|
|
|
- self.addConnection("const2", "prod2", output_port_name="OUT1", input_port_name="IN2")
|
|
|
- self.addConnection("prod2", "sum1", output_port_name="OUT1", input_port_name="IN2")
|
|
|
- self.addConnection("int2", "y", output_port_name="OUT1")
|
|
|
- self.addConnection("int2", "prod3", output_port_name="OUT1", input_port_name="IN1")
|
|
|
- self.addConnection("const3", "prod3", output_port_name="OUT1", input_port_name="IN2")
|
|
|
- self.addConnection("prod3", "sum1", output_port_name="OUT1", input_port_name="IN3")
|
|
|
- self.addConnection("const4", "int1", output_port_name="OUT1", input_port_name="IC")
|
|
|
- self.addConnection("const4", "int2", output_port_name="OUT1", input_port_name="IC")
|
|
|
+ self.add_connection("const5", "prod1", output_port_name="OUT1", input_port_name="IN1")
|
|
|
+ self.add_connection("const1", "prod1", output_port_name="OUT1", input_port_name="IN2")
|
|
|
+ self.add_connection("prod1", "sum1", output_port_name="OUT1", input_port_name="IN1")
|
|
|
+ self.add_connection("sum1", "int1", output_port_name="OUT1", input_port_name="IN1")
|
|
|
+ self.add_connection("int1", "int2", output_port_name="OUT1", input_port_name="IN1")
|
|
|
+ self.add_connection("int1", "prod2", output_port_name="OUT1", input_port_name="IN1")
|
|
|
+ self.add_connection("const2", "prod2", output_port_name="OUT1", input_port_name="IN2")
|
|
|
+ self.add_connection("prod2", "sum1", output_port_name="OUT1", input_port_name="IN2")
|
|
|
+ self.add_connection("int2", "y", output_port_name="OUT1")
|
|
|
+ self.add_connection("int2", "prod3", output_port_name="OUT1", input_port_name="IN1")
|
|
|
+ self.add_connection("const3", "prod3", output_port_name="OUT1", input_port_name="IN2")
|
|
|
+ self.add_connection("prod3", "sum1", output_port_name="OUT1", input_port_name="IN3")
|
|
|
+ self.add_connection("const4", "int1", output_port_name="OUT1", input_port_name="IC")
|
|
|
+ self.add_connection("const4", "int2", output_port_name="OUT1", input_port_name="IC")
|
|
|
|
|
|
|
|
|
def plot_experiment(signals: [Signal]):
|
|
|
@@ -104,9 +104,9 @@ def run_experiment(time_step: float = 0.0001, run_time_seconds: float = 7.0):
|
|
|
smd = SpringMassDamper("SpringMassDamper")
|
|
|
logging.info(f"Running '{smd}' experiment for {run_time_seconds} seconds at {1 / time_step} Hz.")
|
|
|
sim = Simulator(smd)
|
|
|
- sim.setDeltaT(time_step)
|
|
|
+ sim.set_delta_t(time_step)
|
|
|
sim.run(run_time_seconds)
|
|
|
- signals = smd.getSignalHistory("y")
|
|
|
+ signals = smd.get_signal_history("y")
|
|
|
plot_experiment(signals)
|
|
|
in_tolerance = oscillation_difference(signals, TimeFrame(5.0, 7.0), threshold=0.1)
|
|
|
tolerance_output = "The experiment falls within the specified parameters."
|
