diff --git a/src/machineLearning/machineLearning.h b/src/machineLearning/machineLearning.h
index 182a0897aba642c5891cefd795b7788cb066600e..ceefc42f9e220144b1b417235c68de6fb94ebf24 100644
--- a/src/machineLearning/machineLearning.h
+++ b/src/machineLearning/machineLearning.h
@@ -11,9 +11,9 @@
#include "trainingData.h"
////////// Include all of the machine learning algorithms here
-#include "classification.h"
-#include "regression.h"
-//#include "rapidXmmTools.h"
+//#include "classification.h"
+//#include "regression.h"
+#include "rapidXmmTools.h"
//#include "gvf.h"
// forward declaration
@@ -49,16 +49,20 @@ private:
};
////////// typedefs for calling different algorithms
+/*
typedef machineLearning<classification> staticClassification;
typedef machineLearning<regression> staticRegression;
+//*/
-/*
+//*
typedef xmmToolConfig xmmConfig;
typedef machineLearning<xmmGmmTool> xmmStaticClassification;
typedef machineLearning<xmmGmrTool> xmmStaticRegression;
typedef machineLearning<xmmHmmTool> xmmTemporalClassification;
typedef machineLearning<xmmHmrTool> xmmTemporalRegression;
+//*/
+/*
typedef machineLearning<GVF> gvf;
*/
diff --git a/tests/test_project.xcodeproj/project.pbxproj b/tests/test_project.xcodeproj/project.pbxproj
index 04602843f429810c8375fb4fc604d1abcb7c9e48..345f99a363c14636d82caf872fa0969d01fc51f3 100644
--- a/tests/test_project.xcodeproj/project.pbxproj
+++ b/tests/test_project.xcodeproj/project.pbxproj
@@ -7,6 +7,43 @@
objects = {
/* Begin PBXBuildFile section */
+ 311BA2A61EDC6A8900244DAC /* test_rapidXmmTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE2C5EE21ED8480D00E9FAFA /* test_rapidXmmTools.cpp */; };
+ 311BA2AB1EDC6ADB00244DAC /* rapidXmmTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2A91EDC6ADB00244DAC /* rapidXmmTools.cpp */; };
+ 311BA2AF1EDC6AED00244DAC /* rapidPiPoHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2AC1EDC6AED00244DAC /* rapidPiPoHost.cpp */; };
+ 311BA2BB1EDC6C7E00244DAC /* PiPoCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2B61EDC6C7E00244DAC /* PiPoCollection.cpp */; };
+ 311BA2CB1EDC6EC100244DAC /* xmmKMeans.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2C61EDC6EC100244DAC /* xmmKMeans.cpp */; };
+ 311BA2CC1EDC6EC100244DAC /* xmmKMeansParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2C81EDC6EC100244DAC /* xmmKMeansParameters.cpp */; };
+ 311BA2D41EDC6ECE00244DAC /* xmmHierarchicalHmm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2CD1EDC6ECE00244DAC /* xmmHierarchicalHmm.cpp */; };
+ 311BA2D51EDC6ECE00244DAC /* xmmHmmParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2CF1EDC6ECE00244DAC /* xmmHmmParameters.cpp */; };
+ 311BA2D61EDC6ECE00244DAC /* xmmHmmSingleClass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2D21EDC6ECE00244DAC /* xmmHmmSingleClass.cpp */; };
+ 311BA2DD1EDC6EDB00244DAC /* xmmGmm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2D71EDC6EDB00244DAC /* xmmGmm.cpp */; };
+ 311BA2DE1EDC6EDB00244DAC /* xmmGmmParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2D91EDC6EDB00244DAC /* xmmGmmParameters.cpp */; };
+ 311BA2DF1EDC6EDB00244DAC /* xmmGmmSingleClass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2DB1EDC6EDB00244DAC /* xmmGmmSingleClass.cpp */; };
+ 311BA2E41EDC6EEA00244DAC /* xmmPhrase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2E01EDC6EEA00244DAC /* xmmPhrase.cpp */; };
+ 311BA2E51EDC6EEA00244DAC /* xmmTrainingSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2E21EDC6EEA00244DAC /* xmmTrainingSet.cpp */; };
+ 311BA2EE1EDC6EF800244DAC /* xmmModelSharedParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2EA1EDC6EF800244DAC /* xmmModelSharedParameters.cpp */; };
+ 311BA2EF1EDC6EF800244DAC /* xmmModelSingleClass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2EC1EDC6EF800244DAC /* xmmModelSingleClass.cpp */; };
+ 311BA2F21EDC6F0400244DAC /* xmmGaussianDistribution.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2F01EDC6F0400244DAC /* xmmGaussianDistribution.cpp */; };
+ 311BA2FA1EDC6F0F00244DAC /* xmmAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2F31EDC6F0F00244DAC /* xmmAttribute.cpp */; };
+ 311BA2FB1EDC6F0F00244DAC /* xmmJson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2F71EDC6F0F00244DAC /* xmmJson.cpp */; };
+ 311BA2FD1EDC6F9F00244DAC /* rapidXmmTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2A91EDC6ADB00244DAC /* rapidXmmTools.cpp */; };
+ 311BA2FE1EDC6FD000244DAC /* xmmKMeans.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2C61EDC6EC100244DAC /* xmmKMeans.cpp */; };
+ 311BA2FF1EDC6FD000244DAC /* xmmKMeansParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2C81EDC6EC100244DAC /* xmmKMeansParameters.cpp */; };
+ 311BA3001EDC6FD000244DAC /* xmmHierarchicalHmm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2CD1EDC6ECE00244DAC /* xmmHierarchicalHmm.cpp */; };
+ 311BA3011EDC6FD000244DAC /* xmmHmmParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2CF1EDC6ECE00244DAC /* xmmHmmParameters.cpp */; };
+ 311BA3021EDC6FD000244DAC /* xmmHmmSingleClass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2D21EDC6ECE00244DAC /* xmmHmmSingleClass.cpp */; };
+ 311BA3031EDC6FD000244DAC /* xmmGmm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2D71EDC6EDB00244DAC /* xmmGmm.cpp */; };
+ 311BA3041EDC6FD000244DAC /* xmmGmmParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2D91EDC6EDB00244DAC /* xmmGmmParameters.cpp */; };
+ 311BA3051EDC6FD000244DAC /* xmmGmmSingleClass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2DB1EDC6EDB00244DAC /* xmmGmmSingleClass.cpp */; };
+ 311BA3061EDC6FD000244DAC /* xmmPhrase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2E01EDC6EEA00244DAC /* xmmPhrase.cpp */; };
+ 311BA3071EDC6FD000244DAC /* xmmTrainingSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2E21EDC6EEA00244DAC /* xmmTrainingSet.cpp */; };
+ 311BA3081EDC6FD000244DAC /* xmmModelSharedParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2EA1EDC6EF800244DAC /* xmmModelSharedParameters.cpp */; };
+ 311BA3091EDC6FD000244DAC /* xmmModelSingleClass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2EC1EDC6EF800244DAC /* xmmModelSingleClass.cpp */; };
+ 311BA30A1EDC6FD000244DAC /* xmmGaussianDistribution.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2F01EDC6F0400244DAC /* xmmGaussianDistribution.cpp */; };
+ 311BA30B1EDC6FD000244DAC /* xmmAttribute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2F31EDC6F0F00244DAC /* xmmAttribute.cpp */; };
+ 311BA30C1EDC6FD000244DAC /* xmmJson.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 311BA2F71EDC6F0F00244DAC /* xmmJson.cpp */; };
+ 311BA30D1EDC709900244DAC /* jsoncpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE2C5E081ED8450E00E9FAFA /* jsoncpp.cpp */; };
+ 311BA30F1EDC711E00244DAC /* trainingData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE2C5EC01ED8459300E9FAFA /* trainingData.cpp */; };
BE2C5E941ED8450E00E9FAFA /* classification.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE2C5DEA1ED8450E00E9FAFA /* classification.cpp */; };
BE2C5E951ED8450E00E9FAFA /* knnClassification.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE2C5DF31ED8450E00E9FAFA /* knnClassification.cpp */; };
BE2C5E961ED8450E00E9FAFA /* modelSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE2C5DF51ED8450E00E9FAFA /* modelSet.cpp */; };
@@ -73,6 +110,60 @@
0BFFEF261E56083C00EF19A5 /* test_RapidLib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = test_RapidLib; sourceTree = BUILT_PRODUCTS_DIR; };
0BFFEF311E56085C00EF19A5 /* test_rapidXmmTools */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = test_rapidXmmTools; sourceTree = BUILT_PRODUCTS_DIR; };
0BFFEF3F1E5608C000EF19A5 /* test_signalProcessing */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = test_signalProcessing; sourceTree = BUILT_PRODUCTS_DIR; };
+ 311BA2A91EDC6ADB00244DAC /* rapidXmmTools.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rapidXmmTools.cpp; path = rapidXmmTools/rapidXmmTools.cpp; sourceTree = "<group>"; };
+ 311BA2AA1EDC6ADB00244DAC /* rapidXmmTools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rapidXmmTools.h; path = rapidXmmTools/rapidXmmTools.h; sourceTree = "<group>"; };
+ 311BA2AC1EDC6AED00244DAC /* rapidPiPoHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rapidPiPoHost.cpp; path = rapidPiPoTools/rapidPiPoHost.cpp; sourceTree = "<group>"; };
+ 311BA2AD1EDC6AED00244DAC /* rapidPiPoHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rapidPiPoHost.h; path = rapidPiPoTools/rapidPiPoHost.h; sourceTree = "<group>"; };
+ 311BA2B11EDC6C6800244DAC /* PiPo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PiPo.h; path = pipo/src/include/PiPo.h; sourceTree = "<group>"; };
+ 311BA2B21EDC6C6800244DAC /* PiPoParallel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PiPoParallel.h; path = pipo/src/include/PiPoParallel.h; sourceTree = "<group>"; };
+ 311BA2B31EDC6C6800244DAC /* PiPoSequence.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PiPoSequence.h; path = pipo/src/include/PiPoSequence.h; sourceTree = "<group>"; };
+ 311BA2B41EDC6C6800244DAC /* RingBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RingBuffer.h; path = pipo/src/include/RingBuffer.h; sourceTree = "<group>"; };
+ 311BA2B61EDC6C7E00244DAC /* PiPoCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PiPoCollection.cpp; path = pipo/src/host/PiPoCollection.cpp; sourceTree = "<group>"; };
+ 311BA2B71EDC6C7E00244DAC /* PiPoCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PiPoCollection.h; path = pipo/src/host/PiPoCollection.h; sourceTree = "<group>"; };
+ 311BA2B81EDC6C7E00244DAC /* PiPoGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PiPoGraph.h; path = pipo/src/host/PiPoGraph.h; sourceTree = "<group>"; };
+ 311BA2B91EDC6C7E00244DAC /* PiPoHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PiPoHost.h; path = pipo/src/host/PiPoHost.h; sourceTree = "<group>"; };
+ 311BA2BA1EDC6C7E00244DAC /* PiPoModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PiPoModule.h; path = pipo/src/host/PiPoModule.h; sourceTree = "<group>"; };
+ 311BA2BC1EDC6DB900244DAC /* rapidPiPoTools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rapidPiPoTools.h; path = rapidPiPoTools/rapidPiPoTools.h; sourceTree = "<group>"; };
+ 311BA2C61EDC6EC100244DAC /* xmmKMeans.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmmKMeans.cpp; path = xmm/src/models/kmeans/xmmKMeans.cpp; sourceTree = "<group>"; };
+ 311BA2C71EDC6EC100244DAC /* xmmKMeans.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmKMeans.hpp; path = xmm/src/models/kmeans/xmmKMeans.hpp; sourceTree = "<group>"; };
+ 311BA2C81EDC6EC100244DAC /* xmmKMeansParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmmKMeansParameters.cpp; path = xmm/src/models/kmeans/xmmKMeansParameters.cpp; sourceTree = "<group>"; };
+ 311BA2C91EDC6EC100244DAC /* xmmKMeansParameters.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmKMeansParameters.hpp; path = xmm/src/models/kmeans/xmmKMeansParameters.hpp; sourceTree = "<group>"; };
+ 311BA2CA1EDC6EC100244DAC /* xmmKMeansResults.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmKMeansResults.hpp; path = xmm/src/models/kmeans/xmmKMeansResults.hpp; sourceTree = "<group>"; };
+ 311BA2CD1EDC6ECE00244DAC /* xmmHierarchicalHmm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmmHierarchicalHmm.cpp; path = xmm/src/models/hmm/xmmHierarchicalHmm.cpp; sourceTree = "<group>"; };
+ 311BA2CE1EDC6ECE00244DAC /* xmmHierarchicalHmm.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmHierarchicalHmm.hpp; path = xmm/src/models/hmm/xmmHierarchicalHmm.hpp; sourceTree = "<group>"; };
+ 311BA2CF1EDC6ECE00244DAC /* xmmHmmParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmmHmmParameters.cpp; path = xmm/src/models/hmm/xmmHmmParameters.cpp; sourceTree = "<group>"; };
+ 311BA2D01EDC6ECE00244DAC /* xmmHmmParameters.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmHmmParameters.hpp; path = xmm/src/models/hmm/xmmHmmParameters.hpp; sourceTree = "<group>"; };
+ 311BA2D11EDC6ECE00244DAC /* xmmHmmResults.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmHmmResults.hpp; path = xmm/src/models/hmm/xmmHmmResults.hpp; sourceTree = "<group>"; };
+ 311BA2D21EDC6ECE00244DAC /* xmmHmmSingleClass.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmmHmmSingleClass.cpp; path = xmm/src/models/hmm/xmmHmmSingleClass.cpp; sourceTree = "<group>"; };
+ 311BA2D31EDC6ECE00244DAC /* xmmHmmSingleClass.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmHmmSingleClass.hpp; path = xmm/src/models/hmm/xmmHmmSingleClass.hpp; sourceTree = "<group>"; };
+ 311BA2D71EDC6EDB00244DAC /* xmmGmm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmmGmm.cpp; path = xmm/src/models/gmm/xmmGmm.cpp; sourceTree = "<group>"; };
+ 311BA2D81EDC6EDB00244DAC /* xmmGmm.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmGmm.hpp; path = xmm/src/models/gmm/xmmGmm.hpp; sourceTree = "<group>"; };
+ 311BA2D91EDC6EDB00244DAC /* xmmGmmParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmmGmmParameters.cpp; path = xmm/src/models/gmm/xmmGmmParameters.cpp; sourceTree = "<group>"; };
+ 311BA2DA1EDC6EDB00244DAC /* xmmGmmParameters.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmGmmParameters.hpp; path = xmm/src/models/gmm/xmmGmmParameters.hpp; sourceTree = "<group>"; };
+ 311BA2DB1EDC6EDB00244DAC /* xmmGmmSingleClass.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmmGmmSingleClass.cpp; path = xmm/src/models/gmm/xmmGmmSingleClass.cpp; sourceTree = "<group>"; };
+ 311BA2DC1EDC6EDB00244DAC /* xmmGmmSingleClass.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmGmmSingleClass.hpp; path = xmm/src/models/gmm/xmmGmmSingleClass.hpp; sourceTree = "<group>"; };
+ 311BA2E01EDC6EEA00244DAC /* xmmPhrase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmmPhrase.cpp; path = xmm/src/core/trainingset/xmmPhrase.cpp; sourceTree = "<group>"; };
+ 311BA2E11EDC6EEA00244DAC /* xmmPhrase.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmPhrase.hpp; path = xmm/src/core/trainingset/xmmPhrase.hpp; sourceTree = "<group>"; };
+ 311BA2E21EDC6EEA00244DAC /* xmmTrainingSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmmTrainingSet.cpp; path = xmm/src/core/trainingset/xmmTrainingSet.cpp; sourceTree = "<group>"; };
+ 311BA2E31EDC6EEA00244DAC /* xmmTrainingSet.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmTrainingSet.hpp; path = xmm/src/core/trainingset/xmmTrainingSet.hpp; sourceTree = "<group>"; };
+ 311BA2E61EDC6EF800244DAC /* xmmModel.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmModel.hpp; path = xmm/src/core/model/xmmModel.hpp; sourceTree = "<group>"; };
+ 311BA2E71EDC6EF800244DAC /* xmmModelConfiguration.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmModelConfiguration.hpp; path = xmm/src/core/model/xmmModelConfiguration.hpp; sourceTree = "<group>"; };
+ 311BA2E81EDC6EF800244DAC /* xmmModelParameters.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmModelParameters.hpp; path = xmm/src/core/model/xmmModelParameters.hpp; sourceTree = "<group>"; };
+ 311BA2E91EDC6EF800244DAC /* xmmModelResults.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmModelResults.hpp; path = xmm/src/core/model/xmmModelResults.hpp; sourceTree = "<group>"; };
+ 311BA2EA1EDC6EF800244DAC /* xmmModelSharedParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmmModelSharedParameters.cpp; path = xmm/src/core/model/xmmModelSharedParameters.cpp; sourceTree = "<group>"; };
+ 311BA2EB1EDC6EF800244DAC /* xmmModelSharedParameters.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmModelSharedParameters.hpp; path = xmm/src/core/model/xmmModelSharedParameters.hpp; sourceTree = "<group>"; };
+ 311BA2EC1EDC6EF800244DAC /* xmmModelSingleClass.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmmModelSingleClass.cpp; path = xmm/src/core/model/xmmModelSingleClass.cpp; sourceTree = "<group>"; };
+ 311BA2ED1EDC6EF800244DAC /* xmmModelSingleClass.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmModelSingleClass.hpp; path = xmm/src/core/model/xmmModelSingleClass.hpp; sourceTree = "<group>"; };
+ 311BA2F01EDC6F0400244DAC /* xmmGaussianDistribution.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmmGaussianDistribution.cpp; path = xmm/src/core/distributions/xmmGaussianDistribution.cpp; sourceTree = "<group>"; };
+ 311BA2F11EDC6F0400244DAC /* xmmGaussianDistribution.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmGaussianDistribution.hpp; path = xmm/src/core/distributions/xmmGaussianDistribution.hpp; sourceTree = "<group>"; };
+ 311BA2F31EDC6F0F00244DAC /* xmmAttribute.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmmAttribute.cpp; path = xmm/src/core/common/xmmAttribute.cpp; sourceTree = "<group>"; };
+ 311BA2F41EDC6F0F00244DAC /* xmmAttribute.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmAttribute.hpp; path = xmm/src/core/common/xmmAttribute.hpp; sourceTree = "<group>"; };
+ 311BA2F51EDC6F0F00244DAC /* xmmCircularbuffer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmCircularbuffer.hpp; path = xmm/src/core/common/xmmCircularbuffer.hpp; sourceTree = "<group>"; };
+ 311BA2F61EDC6F0F00244DAC /* xmmEvents.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmEvents.hpp; path = xmm/src/core/common/xmmEvents.hpp; sourceTree = "<group>"; };
+ 311BA2F71EDC6F0F00244DAC /* xmmJson.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmmJson.cpp; path = xmm/src/core/common/xmmJson.cpp; sourceTree = "<group>"; };
+ 311BA2F81EDC6F0F00244DAC /* xmmJson.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmJson.hpp; path = xmm/src/core/common/xmmJson.hpp; sourceTree = "<group>"; };
+ 311BA2F91EDC6F0F00244DAC /* xmmMatrix.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = xmmMatrix.hpp; path = xmm/src/core/common/xmmMatrix.hpp; sourceTree = "<group>"; };
+ 311BA2FC1EDC6F1900244DAC /* xmm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xmm.h; path = xmm/src/xmm.h; sourceTree = "<group>"; };
31D7B72C1E6B048100917757 /* test_rapidPiPoTools */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = test_rapidPiPoTools; sourceTree = BUILT_PRODUCTS_DIR; };
BE2C5A0A1ED8450C00E9FAFA /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitignore; sourceTree = "<group>"; };
BE2C5A0B1ED8450C00E9FAFA /* beat2.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = beat2.wav; sourceTree = "<group>"; };
@@ -179,9 +270,181 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
+ 311BA2A41EDC698600244DAC /* pipo */ = {
+ isa = PBXGroup;
+ children = (
+ 311BA2B51EDC6C6F00244DAC /* host */,
+ 311BA2B01EDC6C5A00244DAC /* include */,
+ );
+ name = pipo;
+ sourceTree = "<group>";
+ };
+ 311BA2A51EDC698D00244DAC /* xmm */ = {
+ isa = PBXGroup;
+ children = (
+ 311BA2FC1EDC6F1900244DAC /* xmm.h */,
+ 311BA2BE1EDC6E7100244DAC /* models */,
+ 311BA2BD1EDC6E6700244DAC /* core */,
+ );
+ name = xmm;
+ sourceTree = "<group>";
+ };
+ 311BA2A71EDC6AC300244DAC /* rapidXmmTools */ = {
+ isa = PBXGroup;
+ children = (
+ 311BA2A91EDC6ADB00244DAC /* rapidXmmTools.cpp */,
+ 311BA2AA1EDC6ADB00244DAC /* rapidXmmTools.h */,
+ );
+ name = rapidXmmTools;
+ sourceTree = "<group>";
+ };
+ 311BA2A81EDC6ACC00244DAC /* rapidPiPoTools */ = {
+ isa = PBXGroup;
+ children = (
+ 311BA2BC1EDC6DB900244DAC /* rapidPiPoTools.h */,
+ 311BA2AC1EDC6AED00244DAC /* rapidPiPoHost.cpp */,
+ 311BA2AD1EDC6AED00244DAC /* rapidPiPoHost.h */,
+ );
+ name = rapidPiPoTools;
+ sourceTree = "<group>";
+ };
+ 311BA2B01EDC6C5A00244DAC /* include */ = {
+ isa = PBXGroup;
+ children = (
+ 311BA2B11EDC6C6800244DAC /* PiPo.h */,
+ 311BA2B21EDC6C6800244DAC /* PiPoParallel.h */,
+ 311BA2B31EDC6C6800244DAC /* PiPoSequence.h */,
+ 311BA2B41EDC6C6800244DAC /* RingBuffer.h */,
+ );
+ name = include;
+ sourceTree = "<group>";
+ };
+ 311BA2B51EDC6C6F00244DAC /* host */ = {
+ isa = PBXGroup;
+ children = (
+ 311BA2B61EDC6C7E00244DAC /* PiPoCollection.cpp */,
+ 311BA2B71EDC6C7E00244DAC /* PiPoCollection.h */,
+ 311BA2B81EDC6C7E00244DAC /* PiPoGraph.h */,
+ 311BA2B91EDC6C7E00244DAC /* PiPoHost.h */,
+ 311BA2BA1EDC6C7E00244DAC /* PiPoModule.h */,
+ );
+ name = host;
+ sourceTree = "<group>";
+ };
+ 311BA2BD1EDC6E6700244DAC /* core */ = {
+ isa = PBXGroup;
+ children = (
+ 311BA2C21EDC6E9C00244DAC /* trainingset */,
+ 311BA2C11EDC6E9700244DAC /* model */,
+ 311BA2C01EDC6E8F00244DAC /* distributions */,
+ 311BA2BF1EDC6E8B00244DAC /* common */,
+ );
+ name = core;
+ sourceTree = "<group>";
+ };
+ 311BA2BE1EDC6E7100244DAC /* models */ = {
+ isa = PBXGroup;
+ children = (
+ 311BA2C51EDC6EB100244DAC /* kmeans */,
+ 311BA2C41EDC6EAC00244DAC /* hmm */,
+ 311BA2C31EDC6EA300244DAC /* gmm */,
+ );
+ name = models;
+ sourceTree = "<group>";
+ };
+ 311BA2BF1EDC6E8B00244DAC /* common */ = {
+ isa = PBXGroup;
+ children = (
+ 311BA2F31EDC6F0F00244DAC /* xmmAttribute.cpp */,
+ 311BA2F41EDC6F0F00244DAC /* xmmAttribute.hpp */,
+ 311BA2F51EDC6F0F00244DAC /* xmmCircularbuffer.hpp */,
+ 311BA2F61EDC6F0F00244DAC /* xmmEvents.hpp */,
+ 311BA2F71EDC6F0F00244DAC /* xmmJson.cpp */,
+ 311BA2F81EDC6F0F00244DAC /* xmmJson.hpp */,
+ 311BA2F91EDC6F0F00244DAC /* xmmMatrix.hpp */,
+ );
+ name = common;
+ sourceTree = "<group>";
+ };
+ 311BA2C01EDC6E8F00244DAC /* distributions */ = {
+ isa = PBXGroup;
+ children = (
+ 311BA2F01EDC6F0400244DAC /* xmmGaussianDistribution.cpp */,
+ 311BA2F11EDC6F0400244DAC /* xmmGaussianDistribution.hpp */,
+ );
+ name = distributions;
+ sourceTree = "<group>";
+ };
+ 311BA2C11EDC6E9700244DAC /* model */ = {
+ isa = PBXGroup;
+ children = (
+ 311BA2E61EDC6EF800244DAC /* xmmModel.hpp */,
+ 311BA2E71EDC6EF800244DAC /* xmmModelConfiguration.hpp */,
+ 311BA2E81EDC6EF800244DAC /* xmmModelParameters.hpp */,
+ 311BA2E91EDC6EF800244DAC /* xmmModelResults.hpp */,
+ 311BA2EA1EDC6EF800244DAC /* xmmModelSharedParameters.cpp */,
+ 311BA2EB1EDC6EF800244DAC /* xmmModelSharedParameters.hpp */,
+ 311BA2EC1EDC6EF800244DAC /* xmmModelSingleClass.cpp */,
+ 311BA2ED1EDC6EF800244DAC /* xmmModelSingleClass.hpp */,
+ );
+ name = model;
+ sourceTree = "<group>";
+ };
+ 311BA2C21EDC6E9C00244DAC /* trainingset */ = {
+ isa = PBXGroup;
+ children = (
+ 311BA2E01EDC6EEA00244DAC /* xmmPhrase.cpp */,
+ 311BA2E11EDC6EEA00244DAC /* xmmPhrase.hpp */,
+ 311BA2E21EDC6EEA00244DAC /* xmmTrainingSet.cpp */,
+ 311BA2E31EDC6EEA00244DAC /* xmmTrainingSet.hpp */,
+ );
+ name = trainingset;
+ sourceTree = "<group>";
+ };
+ 311BA2C31EDC6EA300244DAC /* gmm */ = {
+ isa = PBXGroup;
+ children = (
+ 311BA2D71EDC6EDB00244DAC /* xmmGmm.cpp */,
+ 311BA2D81EDC6EDB00244DAC /* xmmGmm.hpp */,
+ 311BA2D91EDC6EDB00244DAC /* xmmGmmParameters.cpp */,
+ 311BA2DA1EDC6EDB00244DAC /* xmmGmmParameters.hpp */,
+ 311BA2DB1EDC6EDB00244DAC /* xmmGmmSingleClass.cpp */,
+ 311BA2DC1EDC6EDB00244DAC /* xmmGmmSingleClass.hpp */,
+ );
+ name = gmm;
+ sourceTree = "<group>";
+ };
+ 311BA2C41EDC6EAC00244DAC /* hmm */ = {
+ isa = PBXGroup;
+ children = (
+ 311BA2CD1EDC6ECE00244DAC /* xmmHierarchicalHmm.cpp */,
+ 311BA2CE1EDC6ECE00244DAC /* xmmHierarchicalHmm.hpp */,
+ 311BA2CF1EDC6ECE00244DAC /* xmmHmmParameters.cpp */,
+ 311BA2D01EDC6ECE00244DAC /* xmmHmmParameters.hpp */,
+ 311BA2D11EDC6ECE00244DAC /* xmmHmmResults.hpp */,
+ 311BA2D21EDC6ECE00244DAC /* xmmHmmSingleClass.cpp */,
+ 311BA2D31EDC6ECE00244DAC /* xmmHmmSingleClass.hpp */,
+ );
+ name = hmm;
+ sourceTree = "<group>";
+ };
+ 311BA2C51EDC6EB100244DAC /* kmeans */ = {
+ isa = PBXGroup;
+ children = (
+ 311BA2C61EDC6EC100244DAC /* xmmKMeans.cpp */,
+ 311BA2C71EDC6EC100244DAC /* xmmKMeans.hpp */,
+ 311BA2C81EDC6EC100244DAC /* xmmKMeansParameters.cpp */,
+ 311BA2C91EDC6EC100244DAC /* xmmKMeansParameters.hpp */,
+ 311BA2CA1EDC6EC100244DAC /* xmmKMeansResults.hpp */,
+ );
+ name = kmeans;
+ sourceTree = "<group>";
+ };
BE2C5A081ED8450C00E9FAFA /* dependencies */ = {
isa = PBXGroup;
children = (
+ 311BA2A51EDC698D00244DAC /* xmm */,
+ 311BA2A41EDC698600244DAC /* pipo */,
BE2C5A091ED8450C00E9FAFA /* Maximilian */,
BE2C5BBE1ED8450D00E9FAFA /* RapidLib */,
BE2C5E041ED8450E00E9FAFA /* third_party */,
@@ -298,6 +561,7 @@
BE2C5EBD1ED8459300E9FAFA /* machineLearning */ = {
isa = PBXGroup;
children = (
+ 311BA2A71EDC6AC300244DAC /* rapidXmmTools */,
BE2C5EBE1ED8459300E9FAFA /* machineLearning.cpp */,
BE2C5EBF1ED8459300E9FAFA /* machineLearning.h */,
BE2C5EC01ED8459300E9FAFA /* trainingData.cpp */,
@@ -309,6 +573,7 @@
BE2C5EC31ED8459300E9FAFA /* signalProcessing */ = {
isa = PBXGroup;
children = (
+ 311BA2A81EDC6ACC00244DAC /* rapidPiPoTools */,
BE2C5EC41ED8459300E9FAFA /* rapidStream */,
BE2C5EC71ED8459300E9FAFA /* signalProcessing.h */,
);
@@ -521,16 +786,34 @@
buildActionMask = 2147483647;
files = (
BE2C5EC81ED8459300E9FAFA /* machineLearning.cpp in Sources */,
+ 311BA2AF1EDC6AED00244DAC /* rapidPiPoHost.cpp in Sources */,
+ 311BA2DD1EDC6EDB00244DAC /* xmmGmm.cpp in Sources */,
+ 311BA2AB1EDC6ADB00244DAC /* rapidXmmTools.cpp in Sources */,
+ 311BA2E41EDC6EEA00244DAC /* xmmPhrase.cpp in Sources */,
+ 311BA2F21EDC6F0400244DAC /* xmmGaussianDistribution.cpp in Sources */,
+ 311BA2D61EDC6ECE00244DAC /* xmmHmmSingleClass.cpp in Sources */,
+ 311BA2CB1EDC6EC100244DAC /* xmmKMeans.cpp in Sources */,
+ 311BA2BB1EDC6C7E00244DAC /* PiPoCollection.cpp in Sources */,
+ 311BA2D41EDC6ECE00244DAC /* xmmHierarchicalHmm.cpp in Sources */,
BE2C5EC91ED8459300E9FAFA /* trainingData.cpp in Sources */,
+ 311BA2FA1EDC6F0F00244DAC /* xmmAttribute.cpp in Sources */,
+ 311BA2D51EDC6ECE00244DAC /* xmmHmmParameters.cpp in Sources */,
BE2C5E981ED8450E00E9FAFA /* regression.cpp in Sources */,
BE2C5EE81ED8480D00E9FAFA /* test_RapidLib.cpp in Sources */,
BE2C5E991ED8450E00E9FAFA /* jsoncpp.cpp in Sources */,
BE2C5ECA1ED8459300E9FAFA /* rapidStream.cpp in Sources */,
+ 311BA2EE1EDC6EF800244DAC /* xmmModelSharedParameters.cpp in Sources */,
BE2C5E941ED8450E00E9FAFA /* classification.cpp in Sources */,
BE2C5E961ED8450E00E9FAFA /* modelSet.cpp in Sources */,
BE2C5EEF1ED849AA00E9FAFA /* svm.cpp in Sources */,
+ 311BA2DF1EDC6EDB00244DAC /* xmmGmmSingleClass.cpp in Sources */,
+ 311BA2CC1EDC6EC100244DAC /* xmmKMeansParameters.cpp in Sources */,
BE2C5E971ED8450E00E9FAFA /* neuralNetwork.cpp in Sources */,
+ 311BA2E51EDC6EEA00244DAC /* xmmTrainingSet.cpp in Sources */,
+ 311BA2FB1EDC6F0F00244DAC /* xmmJson.cpp in Sources */,
+ 311BA2DE1EDC6EDB00244DAC /* xmmGmmParameters.cpp in Sources */,
BE2C5E951ED8450E00E9FAFA /* knnClassification.cpp in Sources */,
+ 311BA2EF1EDC6EF800244DAC /* xmmModelSingleClass.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -538,6 +821,25 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 311BA2A61EDC6A8900244DAC /* test_rapidXmmTools.cpp in Sources */,
+ 311BA2FD1EDC6F9F00244DAC /* rapidXmmTools.cpp in Sources */,
+ 311BA30F1EDC711E00244DAC /* trainingData.cpp in Sources */,
+ 311BA2FE1EDC6FD000244DAC /* xmmKMeans.cpp in Sources */,
+ 311BA2FF1EDC6FD000244DAC /* xmmKMeansParameters.cpp in Sources */,
+ 311BA3001EDC6FD000244DAC /* xmmHierarchicalHmm.cpp in Sources */,
+ 311BA3011EDC6FD000244DAC /* xmmHmmParameters.cpp in Sources */,
+ 311BA3021EDC6FD000244DAC /* xmmHmmSingleClass.cpp in Sources */,
+ 311BA3031EDC6FD000244DAC /* xmmGmm.cpp in Sources */,
+ 311BA3041EDC6FD000244DAC /* xmmGmmParameters.cpp in Sources */,
+ 311BA3051EDC6FD000244DAC /* xmmGmmSingleClass.cpp in Sources */,
+ 311BA3061EDC6FD000244DAC /* xmmPhrase.cpp in Sources */,
+ 311BA3071EDC6FD000244DAC /* xmmTrainingSet.cpp in Sources */,
+ 311BA3081EDC6FD000244DAC /* xmmModelSharedParameters.cpp in Sources */,
+ 311BA3091EDC6FD000244DAC /* xmmModelSingleClass.cpp in Sources */,
+ 311BA30A1EDC6FD000244DAC /* xmmGaussianDistribution.cpp in Sources */,
+ 311BA30B1EDC6FD000244DAC /* xmmAttribute.cpp in Sources */,
+ 311BA30C1EDC6FD000244DAC /* xmmJson.cpp in Sources */,
+ 311BA30D1EDC709900244DAC /* jsoncpp.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -680,7 +982,6 @@
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
- SDKROOT = macosx;
};
name = Debug;
};
@@ -717,7 +1018,6 @@
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = NO;
- SDKROOT = macosx;
};
name = Release;
};