Fix SisRec to run on Linux and Windows

Valetudo_Monte_Carlo/SisRec.py

@@ -1,24 +1,53 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 4.0.2
+# Version 4.0.0
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
 
 from sys import version_info as _swig_python_version_info
 if _swig_python_version_info < (2, 7, 0):
-    raise RuntimeError("Python 2.7 or later required")
+    raise RuntimeError('Python 2.7 or later required')
 
 # Import the low-level C/C++ module
-if __package__ or "." in __name__:
-    from . import _SisRecBase
+if __package__ or '.' in __name__:
+    from . import _SisRec
 else:
-    import _SisRecBase
+    import _SisRec
 
 try:
     import builtins as __builtin__
 except ImportError:
     import __builtin__
 
+def _swig_setattr_nondynamic(self, class_type, name, value, static=1):
+    if name == "thisown":
+        return self.this.own(value)
+    if name == "this":
+        if type(value).__name__ == 'SwigPyObject':
+            self.__dict__[name] = value
+            return
+    method = class_type.__swig_setmethods__.get(name, None)
+    if method:
+        return method(self, value)
+    if not static:
+        object.__setattr__(self, name, value)
+    else:
+        raise AttributeError("You cannot add attributes to %s" % self)
+
+
+def _swig_setattr(self, class_type, name, value):
+    return _swig_setattr_nondynamic(self, class_type, name, value, 0)
+
+
+def _swig_getattr(self, class_type, name):
+    if name == "thisown":
+        return self.this.own()
+    method = class_type.__swig_getmethods__.get(name, None)
+    if method:
+        return method(self)
+    raise AttributeError("'%s' object has no attribute '%s'" % (class_type.__name__, name))
+
+
 def _swig_repr(self):
     try:
         strthis = "proxy of " + self.this.__repr__()
@@ -62,34 +91,34 @@ class _SwigNonDynamicMeta(type):
 
 
 class SisRecSt(object):
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
-    initialState = _SisRecBase.SisRecSt_initialState
-    detectDrogue = _SisRecBase.SisRecSt_detectDrogue
-    detectMain = _SisRecBase.SisRecSt_detectMain
-    finalState = _SisRecBase.SisRecSt_finalState
+    initialState = _SisRec.SisRecSt_initialState
+    detectDrogue = _SisRec.SisRecSt_detectDrogue
+    detectMain = _SisRec.SisRecSt_detectMain
+    finalState = _SisRec.SisRecSt_finalState
 
     def __init__(self, mainPres, MU=0.2):
-        _SisRecBase.SisRecSt_swiginit(self, _SisRecBase.new_SisRecSt(mainPres, MU))
+        _SisRec.SisRecSt_swiginit(self, _SisRec.new_SisRecSt(mainPres, MU))
 
     def initializeBuffers(self, p0):
-        return _SisRecBase.SisRecSt_initializeBuffers(self, p0)
+        return _SisRec.SisRecSt_initializeBuffers(self, p0)
 
     def enable(self):
-        return _SisRecBase.SisRecSt_enable(self)
+        return _SisRec.SisRecSt_enable(self)
 
     def getState(self):
-        return _SisRecBase.SisRecSt_getState(self)
+        return _SisRec.SisRecSt_getState(self)
 
     def update(self, x):
-        return _SisRecBase.SisRecSt_update(self, x)
+        return _SisRec.SisRecSt_update(self, x)
 
     def reset(self):
-        return _SisRecBase.SisRecSt_reset(self)
-    __swig_destroy__ = _SisRecBase.delete_SisRecSt
+        return _SisRec.SisRecSt_reset(self)
+    __swig_destroy__ = _SisRec.delete_SisRecSt
 
-# Register SisRecSt in _SisRecBase:
-_SisRecBase.SisRecSt_swigregister(SisRecSt)
+# Register SisRecSt in _SisRec:
+_SisRec.SisRecSt_swigregister(SisRecSt)
 
 
 

Valetudo_Monte_Carlo/SisRecWindows/SisRec.py

@@ -0,0 +1,95 @@
+# This file was automatically generated by SWIG (http://www.swig.org).
+# Version 4.0.2
+#
+# Do not make changes to this file unless you know what you are doing--modify
+# the SWIG interface file instead.
+
+from sys import version_info as _swig_python_version_info
+if _swig_python_version_info < (2, 7, 0):
+    raise RuntimeError("Python 2.7 or later required")
+
+# Import the low-level C/C++ module
+if __package__ or "." in __name__:
+    from . import _SisRecBase
+else:
+    import _SisRecBase
+
+try:
+    import builtins as __builtin__
+except ImportError:
+    import __builtin__
+
+def _swig_repr(self):
+    try:
+        strthis = "proxy of " + self.this.__repr__()
+    except __builtin__.Exception:
+        strthis = ""
+    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+
+
+def _swig_setattr_nondynamic_instance_variable(set):
+    def set_instance_attr(self, name, value):
+        if name == "thisown":
+            self.this.own(value)
+        elif name == "this":
+            set(self, name, value)
+        elif hasattr(self, name) and isinstance(getattr(type(self), name), property):
+            set(self, name, value)
+        else:
+            raise AttributeError("You cannot add instance attributes to %s" % self)
+    return set_instance_attr
+
+
+def _swig_setattr_nondynamic_class_variable(set):
+    def set_class_attr(cls, name, value):
+        if hasattr(cls, name) and not isinstance(getattr(cls, name), property):
+            set(cls, name, value)
+        else:
+            raise AttributeError("You cannot add class attributes to %s" % cls)
+    return set_class_attr
+
+
+def _swig_add_metaclass(metaclass):
+    """Class decorator for adding a metaclass to a SWIG wrapped class - a slimmed down version of six.add_metaclass"""
+    def wrapper(cls):
+        return metaclass(cls.__name__, cls.__bases__, cls.__dict__.copy())
+    return wrapper
+
+
+class _SwigNonDynamicMeta(type):
+    """Meta class to enforce nondynamic attributes (no new attributes) for a class"""
+    __setattr__ = _swig_setattr_nondynamic_class_variable(type.__setattr__)
+
+
+class SisRecSt(object):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
+    __repr__ = _swig_repr
+    initialState = _SisRecBase.SisRecSt_initialState
+    detectDrogue = _SisRecBase.SisRecSt_detectDrogue
+    detectMain = _SisRecBase.SisRecSt_detectMain
+    finalState = _SisRecBase.SisRecSt_finalState
+
+    def __init__(self, mainPres, MU=0.2):
+        _SisRecBase.SisRecSt_swiginit(self, _SisRecBase.new_SisRecSt(mainPres, MU))
+
+    def initializeBuffers(self, p0):
+        return _SisRecBase.SisRecSt_initializeBuffers(self, p0)
+
+    def enable(self):
+        return _SisRecBase.SisRecSt_enable(self)
+
+    def getState(self):
+        return _SisRecBase.SisRecSt_getState(self)
+
+    def update(self, x):
+        return _SisRecBase.SisRecSt_update(self, x)
+
+    def reset(self):
+        return _SisRecBase.SisRecSt_reset(self)
+    __swig_destroy__ = _SisRecBase.delete_SisRecSt
+
+# Register SisRecSt in _SisRecBase:
+_SisRecBase.SisRecSt_swigregister(SisRecSt)
+
+
+

Valetudo_Monte_Carlo/Valetudo_Monte_Carlo_Dispersion_Analysis.ipynb

@@ -134,9 +134,13 @@
         "id": "dfy17JCLfiZ4"
       },
       "source": [
-        "import SisRec"
+        "# Run on Linux\n",
+        "import SisRec\n",
+        "\n",
+        "# Run on Windows - only for Python 8.5\n",
+        "# from SisRecWindows import SisRec"
       ],
-      "execution_count": 3,
+      "execution_count": 4,
       "outputs": []
     },
     {