Skip to content

Commit 1ebea12

Browse files
committed
Fix SisRec to run on Linux and Windows
1 parent a8433cb commit 1ebea12

File tree

6 files changed

+149
-21
lines changed

6 files changed

+149
-21
lines changed

Valetudo_Monte_Carlo/SisRec.py

Lines changed: 48 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,53 @@
11
# This file was automatically generated by SWIG (http://www.swig.org).
2-
# Version 4.0.2
2+
# Version 4.0.0
33
#
44
# Do not make changes to this file unless you know what you are doing--modify
55
# the SWIG interface file instead.
66

77
from sys import version_info as _swig_python_version_info
88
if _swig_python_version_info < (2, 7, 0):
9-
raise RuntimeError("Python 2.7 or later required")
9+
raise RuntimeError('Python 2.7 or later required')
1010

1111
# Import the low-level C/C++ module
12-
if __package__ or "." in __name__:
13-
from . import _SisRecBase
12+
if __package__ or '.' in __name__:
13+
from . import _SisRec
1414
else:
15-
import _SisRecBase
15+
import _SisRec
1616

1717
try:
1818
import builtins as __builtin__
1919
except ImportError:
2020
import __builtin__
2121

22+
def _swig_setattr_nondynamic(self, class_type, name, value, static=1):
23+
if name == "thisown":
24+
return self.this.own(value)
25+
if name == "this":
26+
if type(value).__name__ == 'SwigPyObject':
27+
self.__dict__[name] = value
28+
return
29+
method = class_type.__swig_setmethods__.get(name, None)
30+
if method:
31+
return method(self, value)
32+
if not static:
33+
object.__setattr__(self, name, value)
34+
else:
35+
raise AttributeError("You cannot add attributes to %s" % self)
36+
37+
38+
def _swig_setattr(self, class_type, name, value):
39+
return _swig_setattr_nondynamic(self, class_type, name, value, 0)
40+
41+
42+
def _swig_getattr(self, class_type, name):
43+
if name == "thisown":
44+
return self.this.own()
45+
method = class_type.__swig_getmethods__.get(name, None)
46+
if method:
47+
return method(self)
48+
raise AttributeError("'%s' object has no attribute '%s'" % (class_type.__name__, name))
49+
50+
2251
def _swig_repr(self):
2352
try:
2453
strthis = "proxy of " + self.this.__repr__()
@@ -62,34 +91,34 @@ class _SwigNonDynamicMeta(type):
6291

6392

6493
class SisRecSt(object):
65-
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
94+
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
6695
__repr__ = _swig_repr
67-
initialState = _SisRecBase.SisRecSt_initialState
68-
detectDrogue = _SisRecBase.SisRecSt_detectDrogue
69-
detectMain = _SisRecBase.SisRecSt_detectMain
70-
finalState = _SisRecBase.SisRecSt_finalState
96+
initialState = _SisRec.SisRecSt_initialState
97+
detectDrogue = _SisRec.SisRecSt_detectDrogue
98+
detectMain = _SisRec.SisRecSt_detectMain
99+
finalState = _SisRec.SisRecSt_finalState
71100

72101
def __init__(self, mainPres, MU=0.2):
73-
_SisRecBase.SisRecSt_swiginit(self, _SisRecBase.new_SisRecSt(mainPres, MU))
102+
_SisRec.SisRecSt_swiginit(self, _SisRec.new_SisRecSt(mainPres, MU))
74103

75104
def initializeBuffers(self, p0):
76-
return _SisRecBase.SisRecSt_initializeBuffers(self, p0)
105+
return _SisRec.SisRecSt_initializeBuffers(self, p0)
77106

78107
def enable(self):
79-
return _SisRecBase.SisRecSt_enable(self)
108+
return _SisRec.SisRecSt_enable(self)
80109

81110
def getState(self):
82-
return _SisRecBase.SisRecSt_getState(self)
111+
return _SisRec.SisRecSt_getState(self)
83112

84113
def update(self, x):
85-
return _SisRecBase.SisRecSt_update(self, x)
114+
return _SisRec.SisRecSt_update(self, x)
86115

87116
def reset(self):
88-
return _SisRecBase.SisRecSt_reset(self)
89-
__swig_destroy__ = _SisRecBase.delete_SisRecSt
117+
return _SisRec.SisRecSt_reset(self)
118+
__swig_destroy__ = _SisRec.delete_SisRecSt
90119

91-
# Register SisRecSt in _SisRecBase:
92-
_SisRecBase.SisRecSt_swigregister(SisRecSt)
120+
# Register SisRecSt in _SisRec:
121+
_SisRec.SisRecSt_swigregister(SisRecSt)
93122

94123

95124

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
# This file was automatically generated by SWIG (http://www.swig.org).
2+
# Version 4.0.2
3+
#
4+
# Do not make changes to this file unless you know what you are doing--modify
5+
# the SWIG interface file instead.
6+
7+
from sys import version_info as _swig_python_version_info
8+
if _swig_python_version_info < (2, 7, 0):
9+
raise RuntimeError("Python 2.7 or later required")
10+
11+
# Import the low-level C/C++ module
12+
if __package__ or "." in __name__:
13+
from . import _SisRecBase
14+
else:
15+
import _SisRecBase
16+
17+
try:
18+
import builtins as __builtin__
19+
except ImportError:
20+
import __builtin__
21+
22+
def _swig_repr(self):
23+
try:
24+
strthis = "proxy of " + self.this.__repr__()
25+
except __builtin__.Exception:
26+
strthis = ""
27+
return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
28+
29+
30+
def _swig_setattr_nondynamic_instance_variable(set):
31+
def set_instance_attr(self, name, value):
32+
if name == "thisown":
33+
self.this.own(value)
34+
elif name == "this":
35+
set(self, name, value)
36+
elif hasattr(self, name) and isinstance(getattr(type(self), name), property):
37+
set(self, name, value)
38+
else:
39+
raise AttributeError("You cannot add instance attributes to %s" % self)
40+
return set_instance_attr
41+
42+
43+
def _swig_setattr_nondynamic_class_variable(set):
44+
def set_class_attr(cls, name, value):
45+
if hasattr(cls, name) and not isinstance(getattr(cls, name), property):
46+
set(cls, name, value)
47+
else:
48+
raise AttributeError("You cannot add class attributes to %s" % cls)
49+
return set_class_attr
50+
51+
52+
def _swig_add_metaclass(metaclass):
53+
"""Class decorator for adding a metaclass to a SWIG wrapped class - a slimmed down version of six.add_metaclass"""
54+
def wrapper(cls):
55+
return metaclass(cls.__name__, cls.__bases__, cls.__dict__.copy())
56+
return wrapper
57+
58+
59+
class _SwigNonDynamicMeta(type):
60+
"""Meta class to enforce nondynamic attributes (no new attributes) for a class"""
61+
__setattr__ = _swig_setattr_nondynamic_class_variable(type.__setattr__)
62+
63+
64+
class SisRecSt(object):
65+
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
66+
__repr__ = _swig_repr
67+
initialState = _SisRecBase.SisRecSt_initialState
68+
detectDrogue = _SisRecBase.SisRecSt_detectDrogue
69+
detectMain = _SisRecBase.SisRecSt_detectMain
70+
finalState = _SisRecBase.SisRecSt_finalState
71+
72+
def __init__(self, mainPres, MU=0.2):
73+
_SisRecBase.SisRecSt_swiginit(self, _SisRecBase.new_SisRecSt(mainPres, MU))
74+
75+
def initializeBuffers(self, p0):
76+
return _SisRecBase.SisRecSt_initializeBuffers(self, p0)
77+
78+
def enable(self):
79+
return _SisRecBase.SisRecSt_enable(self)
80+
81+
def getState(self):
82+
return _SisRecBase.SisRecSt_getState(self)
83+
84+
def update(self, x):
85+
return _SisRecBase.SisRecSt_update(self, x)
86+
87+
def reset(self):
88+
return _SisRecBase.SisRecSt_reset(self)
89+
__swig_destroy__ = _SisRecBase.delete_SisRecSt
90+
91+
# Register SisRecSt in _SisRecBase:
92+
_SisRecBase.SisRecSt_swigregister(SisRecSt)
93+
94+
95+

Valetudo_Monte_Carlo/SisRecWindows/__init__

Whitespace-only changes.
Binary file not shown.

Valetudo_Monte_Carlo/Valetudo_Monte_Carlo_Dispersion_Analysis.ipynb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,13 @@
134134
"id": "dfy17JCLfiZ4"
135135
},
136136
"source": [
137-
"import SisRec"
137+
"# Run on Linux\n",
138+
"import SisRec\n",
139+
"\n",
140+
"# Run on Windows - only for Python 8.5\n",
141+
"# from SisRecWindows import SisRec"
138142
],
139-
"execution_count": 3,
143+
"execution_count": 4,
140144
"outputs": []
141145
},
142146
{

0 commit comments

Comments
 (0)