Merge remote-tracking branch 'upstream/devel' into devel
authorBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Sun, 20 Jan 2013 10:57:41 +0000 (10:57 +0000)
committerBarak A. Pearlmutter <barak+git@cs.nuim.ie>
Sun, 20 Jan 2013 10:57:41 +0000 (10:57 +0000)
commit449c4866067bda5b4d255b2ad36a73a5f9b7015b
tree167739a43d58cd9349b851a3a829fddfd0e8bf9f
parent953cd390780e989cde92f141a2531b9215f334f1
parentafbd35e8fd49db4f4d8c57150988b3968077ddc9
Merge remote-tracking branch 'upstream/devel' into devel
161 files changed:
.gitignore
Core/classifier.h
Core/contours.cpp
Core/contours.h
Core/datasetManager.cpp
Core/drawTimer.cpp
Core/drawTimer.h
Core/dynamical.h
Core/interfaces.h
Core/maximize.h
Core/projector.h
Core/regressor.h
MLDemos/datagenerator.cpp
MLDemos/datagenerator.ui
MLDemos/drawingTools.ui
MLDemos/drawingToolsContext1.ui
MLDemos/drawingToolsContext2.ui
MLDemos/drawingToolsContext3.ui
MLDemos/mldemos.cpp
MLDemos/mldemos.h
MLDemos/mldemos.qrc
MLDemos/mldemos.ui
MLDemos/mlprocessing.cpp
MLDemos/mlsaving.cpp
MLDemos/optsClassify.ui
MLDemos/optsDynamic.ui
MLDemos/optsProject.ui
MLDemos/optsRegress.ui
MLDemos/viewOptions.ui
_3rdParty/3rdParty.pro
_3rdParty/MathLib/Matrix.h
_3rdParty/MathLib/Vector.h
_3rdParty/MathLib/Vector3.h
_3rdParty/fgmm/em.cpp
_3rdParty/fgmm/gaussian.cpp
_AlgorithmsPlugins/CCA/interfaceCCAProjection.cpp
_AlgorithmsPlugins/CCA/interfaceCCAProjection.h
_AlgorithmsPlugins/DBSCAN/interfaceDBSCAN.cpp
_AlgorithmsPlugins/DBSCAN/interfaceDBSCAN.h
_AlgorithmsPlugins/FLAME/interfaceFlameCluster.cpp
_AlgorithmsPlugins/FLAME/interfaceFlameCluster.h
_AlgorithmsPlugins/GMM/classifierGMM.cpp
_AlgorithmsPlugins/GMM/classifierGMM.h
_AlgorithmsPlugins/GMM/dynamicalGMR.cpp
_AlgorithmsPlugins/GMM/dynamicalGMR.h
_AlgorithmsPlugins/GMM/interfaceGMMClassifier.cpp
_AlgorithmsPlugins/GMM/interfaceGMMClassifier.h
_AlgorithmsPlugins/GMM/interfaceGMMCluster.cpp
_AlgorithmsPlugins/GMM/interfaceGMMCluster.h
_AlgorithmsPlugins/GMM/interfaceGMMDynamic.cpp
_AlgorithmsPlugins/GMM/interfaceGMMDynamic.h
_AlgorithmsPlugins/GMM/interfaceGMMRegress.cpp
_AlgorithmsPlugins/GMM/interfaceGMMRegress.h
_AlgorithmsPlugins/GMM/pluginGMM.h
_AlgorithmsPlugins/GMM/regressorGMR.cpp
_AlgorithmsPlugins/GMM/regressorGMR.h
_AlgorithmsPlugins/GP/dynamicalGPR.cpp
_AlgorithmsPlugins/GP/interfaceGPClassifier.cpp
_AlgorithmsPlugins/GP/interfaceGPClassifier.h
_AlgorithmsPlugins/GP/interfaceGPRDynamic.cpp
_AlgorithmsPlugins/GP/interfaceGPRDynamic.h
_AlgorithmsPlugins/GP/interfaceGPRRegress.cpp
_AlgorithmsPlugins/GP/interfaceGPRRegress.h
_AlgorithmsPlugins/GP/regressorGPR.cpp
_AlgorithmsPlugins/KNN/dynamicalKNN.cpp
_AlgorithmsPlugins/KNN/interfaceKNNClassifier.cpp
_AlgorithmsPlugins/KNN/interfaceKNNClassifier.h
_AlgorithmsPlugins/KNN/interfaceKNNDynamic.cpp
_AlgorithmsPlugins/KNN/interfaceKNNDynamic.h
_AlgorithmsPlugins/KNN/interfaceKNNRegress.cpp
_AlgorithmsPlugins/KNN/interfaceKNNRegress.h
_AlgorithmsPlugins/KNN/regressorKNN.cpp
_AlgorithmsPlugins/KernelMethods/dynamicalSVR.cpp
_AlgorithmsPlugins/KernelMethods/dynamicalSVR.h
_AlgorithmsPlugins/KernelMethods/interfaceKMCluster.cpp
_AlgorithmsPlugins/KernelMethods/interfaceKMCluster.h
_AlgorithmsPlugins/KernelMethods/interfaceMVM.cpp
_AlgorithmsPlugins/KernelMethods/interfaceMVM.h
_AlgorithmsPlugins/KernelMethods/interfaceRVMClassifier.cpp
_AlgorithmsPlugins/KernelMethods/interfaceRVMClassifier.h
_AlgorithmsPlugins/KernelMethods/interfaceRVMRegress.cpp
_AlgorithmsPlugins/KernelMethods/interfaceRVMRegress.h
_AlgorithmsPlugins/KernelMethods/interfaceSVMClassifier.cpp
_AlgorithmsPlugins/KernelMethods/interfaceSVMClassifier.h
_AlgorithmsPlugins/KernelMethods/interfaceSVMCluster.cpp
_AlgorithmsPlugins/KernelMethods/interfaceSVMCluster.h
_AlgorithmsPlugins/KernelMethods/interfaceSVMDynamic.cpp
_AlgorithmsPlugins/KernelMethods/interfaceSVMDynamic.h
_AlgorithmsPlugins/KernelMethods/interfaceSVMRegress.cpp
_AlgorithmsPlugins/KernelMethods/interfaceSVMRegress.h
_AlgorithmsPlugins/KernelMethods/paramsRVMregr.ui
_AlgorithmsPlugins/KernelMethods/regressorKRLS.cpp
_AlgorithmsPlugins/KernelMethods/regressorRVM.cpp
_AlgorithmsPlugins/LWPR/dynamicalLWPR.cpp
_AlgorithmsPlugins/LWPR/interfaceLWPRDynamic.cpp
_AlgorithmsPlugins/LWPR/interfaceLWPRDynamic.h
_AlgorithmsPlugins/LWPR/interfaceLWPRRegress.cpp
_AlgorithmsPlugins/LWPR/interfaceLWPRRegress.h
_AlgorithmsPlugins/LWPR/regressorLWPR.cpp
_AlgorithmsPlugins/Lowess/interfaceLowess.cpp
_AlgorithmsPlugins/Lowess/interfaceLowess.h
_AlgorithmsPlugins/Maximizers/interfaceBasic.cpp
_AlgorithmsPlugins/Maximizers/interfaceBasic.h
_AlgorithmsPlugins/Maximizers/interfaceGA.cpp
_AlgorithmsPlugins/Maximizers/interfaceGA.h
_AlgorithmsPlugins/Maximizers/interfaceNLopt.cpp
_AlgorithmsPlugins/Maximizers/interfaceNLopt.h
_AlgorithmsPlugins/Maximizers/interfaceParticleFilters.cpp
_AlgorithmsPlugins/Maximizers/interfaceParticleFilters.h
_AlgorithmsPlugins/Maximizers/interfaceParticles.cpp
_AlgorithmsPlugins/Maximizers/interfaceParticles.h
_AlgorithmsPlugins/Maximizers/maximizeDonut.h
_AlgorithmsPlugins/Maximizers/maximizeGA.h
_AlgorithmsPlugins/Maximizers/maximizeGradient.cpp
_AlgorithmsPlugins/Maximizers/maximizeGradient.h
_AlgorithmsPlugins/Maximizers/maximizeNLopt.cpp
_AlgorithmsPlugins/Maximizers/maximizeNLopt.h
_AlgorithmsPlugins/Maximizers/maximizeParticles.h
_AlgorithmsPlugins/Maximizers/maximizePower.h
_AlgorithmsPlugins/Maximizers/maximizeRandom.cpp
_AlgorithmsPlugins/Maximizers/maximizeRandom.h
_AlgorithmsPlugins/Maximizers/maximizeSwarm.h
_AlgorithmsPlugins/Obstacle/interfaceAvoidance.h
_AlgorithmsPlugins/OpenCV/interfaceBoostClassifier.cpp
_AlgorithmsPlugins/OpenCV/interfaceBoostClassifier.h
_AlgorithmsPlugins/OpenCV/interfaceGBRegress.cpp
_AlgorithmsPlugins/OpenCV/interfaceGBRegress.h
_AlgorithmsPlugins/OpenCV/interfaceMLPClassifier.cpp
_AlgorithmsPlugins/OpenCV/interfaceMLPClassifier.h
_AlgorithmsPlugins/OpenCV/interfaceMLPDynamic.cpp
_AlgorithmsPlugins/OpenCV/interfaceMLPDynamic.h
_AlgorithmsPlugins/OpenCV/interfaceMLPRegress.cpp
_AlgorithmsPlugins/OpenCV/interfaceMLPRegress.h
_AlgorithmsPlugins/OpenCV/paramsGBRegress.ui
_AlgorithmsPlugins/OpenCV/pluginOpenCV.cpp
_AlgorithmsPlugins/OpenCV/pluginOpenCV.pro
_AlgorithmsPlugins/OpenCV/regressorGB.cpp
_AlgorithmsPlugins/Projections/basicOpenCV.cpp
_AlgorithmsPlugins/Projections/interfaceICAProjection.cpp
_AlgorithmsPlugins/Projections/interfaceICAProjection.h
_AlgorithmsPlugins/Projections/interfaceKPCAProjection.cpp
_AlgorithmsPlugins/Projections/interfaceKPCAProjection.h
_AlgorithmsPlugins/Projections/interfaceLDAProjection.cpp
_AlgorithmsPlugins/Projections/interfaceLDAProjection.h
_AlgorithmsPlugins/Projections/interfacePCAProjection.cpp
_AlgorithmsPlugins/Projections/interfacePCAProjection.h
_AlgorithmsPlugins/Projections/interfaceProjections.cpp
_AlgorithmsPlugins/Projections/interfaceProjections.h
_AlgorithmsPlugins/Projections/pluginProjections.cpp
_AlgorithmsPlugins/Projections/pluginProjections.pro
_AlgorithmsPlugins/Reinforcements/interfaceDP.cpp
_AlgorithmsPlugins/Reinforcements/interfaceDP.h
_AlgorithmsPlugins/Reinforcements/interfaceGA.cpp
_AlgorithmsPlugins/Reinforcements/interfaceGA.h
_AlgorithmsPlugins/Reinforcements/interfacePower.cpp
_AlgorithmsPlugins/Reinforcements/interfacePower.h
_AlgorithmsPlugins/Reinforcements/interfaceRandom.cpp
_AlgorithmsPlugins/Reinforcements/interfaceRandom.h
_AlgorithmsPlugins/SEDS/dynamicalSEDS.cpp
_AlgorithmsPlugins/SEDS/interfaceSEDSDynamic.cpp
_AlgorithmsPlugins/SEDS/interfaceSEDSDynamic.h