Various fix

masfaraud · Oct 7, 2018 · e766e61 · e766e61
1 parent e8657a3
commit e766e61
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/bms/blocks/__init__.py b/bms/blocks/__init__.py
@@ -2,4 +2,3 @@
 
 from bms.blocks.continuous import *
 from bms.blocks.nonlinear import *
-from bms.blocks.simplified_blocks import *
diff --git a/bms/core.py b/bms/core.py
@@ -521,7 +521,7 @@ def PlotVariables(self, subplots_variables=None):
             axs[isub].grid()
 
         plt.xlabel('Time')
-        fig.show()
+        plt.show()
 
     def DrawModel(self):
         from .interface import ModelDrawer

diff --git a/bms/signals/__init__.py b/bms/signals/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
 
 from bms.signals.functions import *
-from bms.signals.simplified_signals import *
 from bms.signals.wltp import *
diff --git a/setup.py b/setup.py
@@ -24,5 +24,5 @@ def readme():
       license = 'Creative Commons Attribution-Share Alike license',
       packages = ['bms', 'bms.blocks', 'bms.signals', 'bms.physical'],
       package_dir = {'bms': 'bms'},
-      install_requires = ['numpy', 'matplotlib>=2.0', 'networkx', 'dill'],
+      install_requires = ['numpy', 'matplotlib>=2.0', 'networkx>=2.0', 'dill'],
       classifiers = ['Topic :: Scientific/Engineering', 'Development Status :: 3 - Alpha'])
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,3 @@

		from bms.blocks.continuous import *
		from bms.blocks.nonlinear import *
		from bms.blocks.simplified_blocks import *