Adding BRDF 2 moments

sources/core/core.pro

@@ -5,7 +5,7 @@ CONFIG  *= static  \
 DESTDIR  = ../build
 
 unix{
-	QMAKE_CXXFLAGS += -std=c++0x -m64
+	QMAKE_CXXFLAGS += -std=c++0x
 }
 
 HEADERS  = args.h               \

sources/softs/brdf2moments/brdf2moments.pro

+CONFIG         += console \
+                  qt
+
+INCLUDEPATH    += ../../
+DESTDIR         = ../../build
+
+SOURCES        += main.cpp
+LIBS           += -L../../build -lcore
+
+unix{
+   PRE_TARGETDEPS += ../../build/libcore.a
+}

sources/softs/brdf2moments/main.cpp

+#include <core/args.h>
+#include <core/data.h>
+#include <core/params.h>
+#include <core/function.h>
+#include <core/fitter.h>
+#include <core/plugins_manager.h>
+
+#include <QApplication>
+
+#include <iostream>
+#include <vector>
+#include <iostream>
+#include <fstream>
+#include <limits>
+#include <cstdlib>
+#include <cmath>
+
+int main(int argc, char** argv)
+{
+    QApplication app(argc, argv, false);
+    arguments args(argc, argv) ;
+
+    plugins_manager manager(args) ;
+
+    if(args.is_defined("help")) {
+        std::cout << "<<HELP>> data2moments --input data.file --output gnuplot.file --function loader.so" << std::endl ;
+        std::cout << " - input, output and data are mandatory parameters" << std::endl ;
+        return 0 ;
+    }
+
+    if(! args.is_defined("input")) {
+        std::cerr << "<<ERROR>> the input filename is not defined" << std::endl ;
+        return 1 ;
+    }
+    if(! args.is_defined("output")) {
+        std::cerr << "<<ERROR>> the output filename is not defined" << std::endl ;
+        return 1 ;
+    }
+    if(! args.is_defined("func")) {
+        std::cerr << "<<ERROR>> the data loader is not defined" << std::endl ;
+        return 1 ;
+    }
+
+    // Import data
+    function* f = NULL ;
+    f = manager.get_function(args) ;
+    f->load(args["input"]);
+
+    // Create output file
+    std::ofstream file(args["output"].c_str(), std::ios_base::trunc);
+
+    if(f != NULL)
+    {
+        // Data parametrization
+        params::input func_param = f->parametrization();
+        int d_size = params::dimension(func_param);
+
+        double in_angle[4] = {0.0, 0.0, 0.0, 0.0} ;
+
+        // Sample every degree
+        double dtheta = 0.5*M_PI / 90.0;
+
+        // Moments
+        vec rawm0(f->dimY());
+        vec rawm1(f->dimY());
+
+        for(int theta_in=0; theta_in<90; theta_in++)
+        {
+            in_angle[0] = theta_in * 0.5*M_PI / 90.0;
+
+            // Integrate over the light hemisphere
+            for(int theta_out=0; theta_out<90; theta_out++)
+            {
+                in_angle[2] = theta_out * 0.5*M_PI / 90.0;
+                for(int phi_out=0; phi_out<180; phi_out++)
+                {
+                    in_angle[3] = phi_out * 0.5*M_PI / 180.0;
+
+                    vec in(d_size);
+                    params::convert(in_angle, params::SPHERICAL_TL_PL_TV_PV, func_param, &in[0]);
+
+                    // Copy the input vector
+                    vec x = f->value(in);
+
+                    for(int i=0; i<f->dimY(); ++i)
+                    {
+                        double val = x[i] * cos(in_angle[2]);
+
+                        rawm0[i] += val;
+                        rawm1[i] += theta_out * val;
+                    }
+                }
+            }
+
+            for(int i=0; i<f->dimY(); ++i)
+            {
+                rawm0[i] /= 180.0*90.0;
+                rawm1[i] /= 180.0*90.0 * rawm0[i];
+            }
+
+            // Output the value into the file
+            file << in_angle[0] << "\t";
+
+            for(int i=0; i<rawm0.size(); ++i)
+                file << rawm0[i] << "\t";
+
+            for(int i=0; i<rawm1.size(); ++i)
+                file << rawm1[i] << "\t";
+            file << std::endl;
+
+        }
+
+        file.close();
+    }
+    else
+    {
+        std::cerr << "<<ERROR>> load file \"" << args["input"] << "\"" << std::endl ;
+    }
+
+	 delete f;
+
+    return 0 ;
+}

sources/softs/data2brdf/main.cpp

@@ -45,6 +45,7 @@ int main(int argc, char** argv)
 	}
 
 	//	if(fitters.size() > 0 && datas.size() > 0 && functions.size() > 0)
+	if(fit != NULL)
 	{
 		fit->set_parameters(args) ;
 
@@ -176,11 +177,10 @@ int main(int argc, char** argv)
 		}
 
 	}	
-	/*	else
-		{
-		std::cout << "<<ERROR>> not enough plugin defined" << std::endl ;
-		}
-		*/
+	else
+	{
+		std::cout << "<<ERROR>> no fitter loaded, please check your command line arguments" << std::endl ;
+	}
 
 	return 0 ;
 }

sources/softs/softs.pro

@@ -6,5 +6,6 @@ SUBDIRS  = generate_data   \
 			  data2gnuplot    \
 			  data2diff       \
            data2moments    \
+           brdf2moments    \
            tests           \
 #			  fourieranalysis