Merge

external/SConscript

@@ -11,7 +11,7 @@ execfile('obtain_ceres.py')
 ##
 #   QuadProg++
 ##
-qp_target  = 'build' + os.sep + 'lib' + os.sep + 'quaprog++'
+qp_target  = 'build' + os.sep + 'lib' + os.sep + 'quadprog++'
 qp_base    = 'quadprog++' + os.sep
 qp_sources = [qp_base + 'Array.cc', qp_base + 'QuadProg++.cc']
 env.Append(CPPPATH = ['build' + os.sep + 'include'])

sources/core/rational_function.cpp

@@ -35,7 +35,7 @@ void rational_function_1d::update(const vec& in_a,
 	a.resize(in_a.size()) ;
 	b.resize(in_b.size()) ;
 
-#define NORMALIZE
+//#define NORMALIZE
 
 #ifdef NORMALIZE
     const double b0 = (std::abs(in_b[0]) > 1.0E-10) ? in_b[0] : 1.0;

sources/plugins/SConscript

 
 # Building fitters
 SConscript('nonlinear_fitter_ceres/SConscript')
+SConscript('rational_fitter_quadprog/SConscript')
 
 # Building functions
 SConscript('nonlinear_function_diffuse/SConscript')
 SConscript('nonlinear_function_blinn/SConscript')
 SConscript('nonlinear_function_retroblinn/SConscript')
+SConscript('rational_function_legendre/SConscript')
+SConscript('rational_function_chebychev/SConscript')

sources/plugins/rational_fitter_quadprog/SConscript

+env = Environment()
+env.Append(CPPPATH = ['../../../external/quadprog++', '../../../external/build/include', '../../'])
+env.Append(LIBPATH = ['../../../external/build/lib', '../../build'])
+
+sources = ['rational_fitter.cpp']
+libs = ['-lcore', '-lquadprog++']
+env.SharedLibrary('../../build/rational_fitter_quadprog', sources, LIBS=libs)

sources/plugins/rational_function_chebychev/SConscript

+env = Environment()
+env.Append(CPPPATH = ['../../../external/build/include', '../../'])
+env.Append(LIBPATH = ['../../../external/build/lib', '../../build'])
+
+sources = ['rational_function.cpp']
+libs = ['-lcore']
+env.SharedLibrary('../../build/rational_function_chebychev', sources, LIBS=libs)

sources/plugins/rational_function_legendre/SConscript

+env = Environment()
+env.Append(CPPPATH = ['../../../external/build/include', '../../'])
+env.Append(LIBPATH = ['../../../external/build/lib', '../../build'])
+
+sources = ['rational_function.cpp']
+libs = ['-lcore']
+env.SharedLibrary('../../build/rational_function_legendre', sources, LIBS=libs)