Correct build files

Author: deeuu

build/Makefile

@@ -37,6 +37,7 @@ SOURCES=../src/thirdParty/cnpy/cnpy.cpp \
 ../src/modules/ARAverager.cpp \
 ../src/modules/PeakFollower.cpp \
 ../src/modules/SMA.cpp \
+../src/modules/EMA.cpp \
 ../src/modules/FrameGenerator.cpp \
 ../src/modules/Window.cpp \
 ../src/modules/HoppingGoertzelDFT.cpp \
@@ -48,19 +49,21 @@ SOURCES=../src/thirdParty/cnpy/cnpy.cpp \
 ../src/modules/MultiSourceRoexBank.cpp \
 ../src/modules/FixedRoexBank.cpp \
 ../src/modules/DoubleRoexBank.cpp \
+../src/modules/MultiSourceDoubleRoexBank.cpp \
 ../src/modules/OctaveBank.cpp \
 ../src/modules/MainLoudnessDIN456311991.cpp \
 ../src/modules/InstantaneousLoudnessDIN456311991.cpp \
 ../src/modules/SpecificLoudnessANSIS342007.cpp \
-../src/modules/SpecificLoudnessModANSIS342007.cpp \
 ../src/modules/SpecificPartialLoudnessMGB1997.cpp \
+../src/modules/SpecificPartialLoudnessCHGM2011.cpp \
 ../src/modules/BinauralInhibitionMG2007.cpp \
 ../src/modules/InstantaneousLoudness.cpp \
+../src/modules/ForwardMaskingPO1998.cpp \
 ../src/models/StationaryLoudnessANSIS342007.cpp \
 ../src/models/StationaryLoudnessDIN456311991.cpp \
 ../src/models/StationaryLoudnessCHGM2011.cpp \
 ../src/models/DynamicLoudnessGM2002.cpp \
-../src/models/DynamicLoudnessCH2012.cpp
+../src/models/DynamicLoudnessCH2012.cpp \
 
 OBJECTS=$(SOURCES:.cpp=.o)
 

swig/SignalBank.i

@@ -17,7 +17,7 @@ public:
     inline int getNTotalSamples();
     int getFs();
     inline void setSample(int source, int ear, int channel, int sample, Real value);
-    inline Real getSample(int source, int ear, int channel, int sample) const;
+    inline Real getSample(int source=0, int ear=0, int channel=0, int sample=0) const;
     inline void setCentreFreq(int channel, Real freq);
     inline Real getCentreFreq(int channel) const;
     inline bool getTrig();

swig/__init__.py

@@ -1,2 +1,2 @@
-from core import *
-import tools
+from .core import *
+from . import tools

swig/build.sh

@@ -38,6 +38,7 @@
 #include "../src/modules/Butter.h"
 #include "../src/modules/Biquad.h"
 #include "../src/modules/SMA.h"
+#include "../src/modules/EMA.h"
 #include "../src/modules/AudioFileCutter.h"
 #include "../src/modules/FrameGenerator.h"
 #include "../src/modules/Window.h"
@@ -49,14 +50,16 @@
 #include "../src/modules/FastRoexBank.h"
 #include "../src/modules/MultiSourceRoexBank.h"
 #include "../src/modules/DoubleRoexBank.h"
+#include "../src/modules/MultiSourceDoubleRoexBank.h"
 #include "../src/modules/FixedRoexBank.h"
 #include "../src/modules/OctaveBank.h"
 #include "../src/modules/SpecificLoudnessANSIS342007.h"
-#include "../src/modules/SpecificLoudnessModANSIS342007.h"
 #include "../src/modules/SpecificPartialLoudnessMGB1997.h"
+#include "../src/modules/SpecificPartialLoudnessCHGM2011.h"
 #include "../src/modules/MainLoudnessDIN456311991.h"
 #include "../src/modules/BinauralInhibitionMG2007.h"
 #include "../src/modules/InstantaneousLoudness.h"
+#include "../src/modules/ForwardMaskingPO1998.h"
 #include "../src/modules/InstantaneousLoudnessDIN456311991.h"
 #include "../src/modules/ARAverager.h"
 #include "../src/modules/PeakFollower.h"
@@ -126,6 +129,7 @@ using std::vector;
 %include "../src/modules/Butter.h"
 %include "../src/modules/Biquad.h"
 %include "../src/modules/SMA.h"
+%include "../src/modules/EMA.h"
 %include "../src/modules/AudioFileCutter.h"
 %include "../src/modules/FrameGenerator.h"
 %include "../src/modules/Window.h"
@@ -138,13 +142,15 @@ using std::vector;
 %include "../src/modules/MultiSourceRoexBank.h"
 %include "../src/modules/FixedRoexBank.h"
 %include "../src/modules/DoubleRoexBank.h"
+%include "../src/modules/MultiSourceDoubleRoexBank.h"
 %include "../src/modules/OctaveBank.h"
 %include "../src/modules/SpecificLoudnessANSIS342007.h"
-%include "../src/modules/SpecificLoudnessModANSIS342007.h"
 %include "../src/modules/SpecificPartialLoudnessMGB1997.h"
+%include "../src/modules/SpecificPartialLoudnessCHGM2011.h"
 %include "../src/modules/MainLoudnessDIN456311991.h"
 %include "../src/modules/BinauralInhibitionMG2007.h"
 %include "../src/modules/InstantaneousLoudness.h"
+%include "../src/modules/ForwardMaskingPO1998.h"
 %include "../src/modules/InstantaneousLoudnessDIN456311991.h"
 %include "../src/modules/ARAverager.h"
 %include "../src/modules/PeakFollower.h"

swig/core.i

@@ -42,6 +42,7 @@
                     "../src/modules/Butter.cpp",
                     "../src/modules/Biquad.cpp",
                     "../src/modules/SMA.cpp",
+                    "../src/modules/EMA.cpp",
                     "../src/modules/AudioFileCutter.cpp",
                     "../src/modules/FrameGenerator.cpp",
                     "../src/modules/Window.cpp",
@@ -54,21 +55,23 @@
                     "../src/modules/MultiSourceRoexBank.cpp",
                     "../src/modules/FixedRoexBank.cpp",
                     "../src/modules/DoubleRoexBank.cpp",
+                    "../src/modules/MultiSourceDoubleRoexBank.cpp",
                     "../src/modules/OctaveBank.cpp",
                     "../src/modules/MainLoudnessDIN456311991.cpp",
                     "../src/modules/SpecificLoudnessANSIS342007.cpp",
                     "../src/modules/SpecificPartialLoudnessMGB1997.cpp",
-                    "../src/modules/SpecificLoudnessModANSIS342007.cpp",
+                    "../src/modules/SpecificPartialLoudnessCHGM2011.cpp",
                     "../src/modules/BinauralInhibitionMG2007.cpp",
                     "../src/modules/InstantaneousLoudness.cpp",
+                    "../src/modules/ForwardMaskingPO1998.cpp",
                     "../src/modules/InstantaneousLoudnessDIN456311991.cpp",
                     "../src/modules/ARAverager.cpp",
                     "../src/modules/PeakFollower.cpp",
                     "../src/models/StationaryLoudnessANSIS342007.cpp",
                     "../src/models/StationaryLoudnessCHGM2011.cpp",
                     "../src/models/StationaryLoudnessDIN456311991.cpp",
                     "../src/models/DynamicLoudnessGM2002.cpp",
-                    "../src/models/DynamicLoudnessCH2012.cpp",
+                    "../src/models/DynamicLoudnessCH2012.cpp"
                 ],
                 include_dirs=[numpy_include, "/usr/include"],
                 library_dirs=['/usr/lib', '/usr/local/lib'],