Moving simplified blocks and signals in files

masfaraud · Oct 7, 2018 · 1146c5e · 1146c5e
1 parent d8a28b7
commit 1146c5e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 42 deletions.
diff --git a/bms/blocks/continuous.py b/bms/blocks/continuous.py
@@ -200,6 +200,27 @@ def LabelConnections(self):
         return ['', '']
 
 
+class IntegrationBlock(ODE):
+    """
+        Creates an ODE block that performs integration over time.
+    """
+    def __init__(self, input_variable, output_variable):
+        ODE.__init__(self, input_variable, output_variable, a=[1], b=[0, 1])
+
+    def LabelBlock(self):
+        return 'Integral'
+
+class DifferentiationBlock(ODE):
+    """
+        Creates an ODE block that performs differentation relative to time.
+    """
+    def __init__(self, input_variable, output_variable):
+        ODE.__init__(self, input_variable, output_variable, a=[0, 1], b=[1])
+
+    def LabelBlock(self):
+        return 'dx/dt'
+
+
 class FunctionBlock(Block):
     """
         output = f(input)    

diff --git a/bms/blocks/simplified_blocks.py b/bms/blocks/simplified_blocks.py
diff --git a/bms/signals/functions.py b/bms/signals/functions.py
@@ -39,6 +39,7 @@ def function(t):
                 return (t-delay) * amplitude + offset
         self.function = function
 
+unit_ramp = Ramp(amplitude = 1, name='Unit ramp')
 
 class Sinus(Signal):
     def __init__(self, name='Sinus', amplitude=1, w=1, phase=0, offset=0):

diff --git a/bms/signals/simplified_signals.py b/bms/signals/simplified_signals.py