diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b17b0d..f6dd1ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,28 +1,28 @@ cmake_minimum_required(VERSION 3.12) project(guggisberg_liardon_numerical_integration) set(CMAKE_CXX_STANDARD 14) include_directories(.) add_executable(guggisberg_liardon_numerical_integration CMakeLists.txt Domain.cpp Domain.hpp DomainCartesian.cpp DomainCartesian.hpp Function.cpp Function.hpp Method.cpp Method.hpp IntegrationSolver.cpp IntegrationSolver.hpp IntegralSolver1D.cpp IntegralSolver1D.hpp IntegralSolver2D.cpp IntegralSolver2D.hpp main.cpp Exception.cpp Exception.hpp OutOfRangeException.cpp - OutOfRangeException.hpp) + OutOfRangeException.hpp FunctionRntoR.cpp FunctionRntoR.hpp) diff --git a/Domain.hpp b/Domain.hpp index 14cf934..7b7fc5c 100644 --- a/Domain.hpp +++ b/Domain.hpp @@ -1,45 +1,44 @@ /* * Created by Tristan Liardon on 02.12.2018. * * Domain object is defined by the boundaries (two for each dimension) and the subdivision of each dimension * * * boundaries - vector that contains a vector of double for each dimension. boundaries[i][1] is the end of the the domain in the * dimension i + 1 * * * subdivision1D - integer value of the number of subdivision for the 1D case * * * subdivision - vector of integer with the number of subdivision for each dimension * */ #ifndef PCSC_PROJET_DOMAIN_HPP #define PCSC_PROJET_DOMAIN_HPP #include #include #include "OutOfRangeException.hpp" #include "Exception.hpp" using namespace std; class Domain { public: // Constructor and destructor Domain(); virtual ~Domain(); // Get number of elements virtual int GetNumberElements() = 0; // Boundaries vector> boundaries; int dimension; - int subdivision1D; vector subdivision; }; #endif //PCSC_PROJET_DOMAIN_HPP diff --git a/DomainCartesian.cpp b/DomainCartesian.cpp index 13728ff..d74704d 100644 --- a/DomainCartesian.cpp +++ b/DomainCartesian.cpp @@ -1,59 +1,62 @@ // // Created by Tristan Liardon on 11.12.2018. // #include "DomainCartesian.hpp" DomainCartesian::DomainCartesian() {} DomainCartesian::DomainCartesian(vector> boundaries_, vector subdivision_) { boundaries = boundaries_; dimension = (int)boundaries.size(); subdivision = subdivision_; //Exception: the amount of subdivisions must be over 0. for(int i = 0; i < dimension; i++){ if (subdivision[i]<1){ OutOfRangeException error("The amount of subdivisions must be over 0."); error.PrintDebug(); exit(0); } } //Exception: only 1D and 2D integration methods have been implemented if (dimension > 2){ OutOfRangeException error("The integration methods for dimensions over 2 have not been implemented."); error.PrintDebug(); exit(0); } } DomainCartesian::DomainCartesian(double a_, double b_, int subdivision_) { // Transform the boundaries double into the vector form vector dim1; dim1.push_back(a_); dim1.push_back(b_); boundaries.push_back(dim1); dimension = 1; - subdivision1D = subdivision_; + subdivision.push_back(subdivision_); //Exception: the amount of subdivisions must be over 0. - if (subdivision1D<1){ + if (subdivision[0]<1){ OutOfRangeException error("The amount of subdivisions must be over 0."); error.PrintDebug(); exit(0); } } -//DomainCartesian::~DomainCartesian() {} - // Get number of elements int DomainCartesian::GetNumberElements() { -// if dim - return subdivision1D; + int total = 1; + for (int i = 0; i < (int)subdivision.size(); i++) { + + total *= subdivision[i]; + + } + return total; } diff --git a/DomainCartesian.hpp b/DomainCartesian.hpp index 4e723a9..2b0aacc 100644 --- a/DomainCartesian.hpp +++ b/DomainCartesian.hpp @@ -1,23 +1,22 @@ // // Created by Tristan Liardon on 11.12.2018. // #ifndef GUGGISBERG_LIARDON_NUMERICAL_INTEGRATION_DOMAINCARTESIAN_HPP #define GUGGISBERG_LIARDON_NUMERICAL_INTEGRATION_DOMAINCARTESIAN_HPP #include "Domain.hpp" class DomainCartesian : public Domain { public: // Constructor and destructor DomainCartesian(); DomainCartesian(vector> boundaries_, vector subdivision_); DomainCartesian(double a_, double b_, int subdivision_); // For ease of use, simple 1D constructor -// ~DomainCartesian(); // Get number of elements int GetNumberElements() override; }; #endif //GUGGISBERG_LIARDON_NUMERICAL_INTEGRATION_DOMAINCARTESIAN_HPP diff --git a/Function.cpp b/Function.cpp index 7bcafbf..05ba34c 100644 --- a/Function.cpp +++ b/Function.cpp @@ -1,26 +1,6 @@ #include "Function.hpp" - // Constructor and destructor Function::Function() {} -Function::Function(double (*functionPointer_)(vector)) { - - functionPointer = functionPointer_; - -} Function::~Function() {} - -// Get result method -double Function::GetResult(vector input) { - - //Exception: the function is out of value - if (isnan(functionPointer(input))==1){ - OutOfRangeException error("The function is undefined in the domain."); - error.PrintDebug(); - exit(0); - } - - return functionPointer(input); - -} \ No newline at end of file diff --git a/Function.hpp b/Function.hpp index 0dc58a1..c3c2cfb 100644 --- a/Function.hpp +++ b/Function.hpp @@ -1,45 +1,35 @@ /* * Created by Tristan Liardon on 02.12.2018. * * A function object that needs a pointer to a user defined function. This allows the user defined function to be called * using a simple syntax FunctionObject.GetResult(input) from everywhere without risking mistakes in the complex * writing of the function pointer argument. * * For using a function-object : * - Create a method that accepts vector and return a double * - Create a pointer to the method created above. You can use the following syntax : * double (*functionPointer)(vector) = &myFunction; * - Gives functionPointer as arguments to the Function's constructor * */ #ifndef PCSC_PROJET_FUNCTION_HPP #define PCSC_PROJET_FUNCTION_HPP #include #include #include "OutOfRangeException.hpp" #include "Exception.hpp" using namespace std; - class Function { public: // Constructor and destructor Function(); - explicit Function(double (*functionPointer_)(vector)); virtual ~Function(); - // Get result function - double GetResult(vector input); - -private: - - double(*functionPointer)(vector); // Pointer to the user-defined function - }; - #endif //PCSC_PROJET_FUNCTION_HPP diff --git a/Function.cpp b/FunctionRntoR.cpp similarity index 53% copy from Function.cpp copy to FunctionRntoR.cpp index 7bcafbf..6e9f0bc 100644 --- a/Function.cpp +++ b/FunctionRntoR.cpp @@ -1,26 +1,29 @@ +// +// Created by Tristan Liardon on 12.12.2018. +// -#include "Function.hpp" +#include "FunctionRntoR.hpp" // Constructor and destructor -Function::Function() {} -Function::Function(double (*functionPointer_)(vector)) { +FunctionRntoR::FunctionRntoR() {} +FunctionRntoR::FunctionRntoR(double (*functionPointer_)(vector)) { functionPointer = functionPointer_; } -Function::~Function() {} +FunctionRntoR::~FunctionRntoR() {} // Get result method -double Function::GetResult(vector input) { +double FunctionRntoR::GetResult(vector input) { //Exception: the function is out of value if (isnan(functionPointer(input))==1){ OutOfRangeException error("The function is undefined in the domain."); error.PrintDebug(); exit(0); } - return functionPointer(input); -} \ No newline at end of file +} + diff --git a/FunctionRntoR.hpp b/FunctionRntoR.hpp new file mode 100644 index 0000000..b269dd4 --- /dev/null +++ b/FunctionRntoR.hpp @@ -0,0 +1,28 @@ +// +// Created by Tristan Liardon on 12.12.2018. +// + +#ifndef GUGGISBERG_LIARDON_NUMERICAL_INTEGRATION_FUNCTIONRNTOR_HPP +#define GUGGISBERG_LIARDON_NUMERICAL_INTEGRATION_FUNCTIONRNTOR_HPP + +#include "Function.hpp" + +class FunctionRntoR : public Function { + +public: + // Constructor and destructor + FunctionRntoR(); + explicit FunctionRntoR(double (*functionPointer_)(vector)); + virtual ~FunctionRntoR() override; + + // Get result function + double GetResult(vector input); + +private: + + double(*functionPointer)(vector); // Pointer to the user-defined function + +}; + + +#endif //GUGGISBERG_LIARDON_NUMERICAL_INTEGRATION_FUNCTIONRNTOR_HPP diff --git a/IntegralSolver1D.cpp b/IntegralSolver1D.cpp index 37d6460..3606a35 100644 --- a/IntegralSolver1D.cpp +++ b/IntegralSolver1D.cpp @@ -1,85 +1,85 @@ #include "IntegralSolver1D.hpp" #include "Function.hpp" //constructor, deconstructor -IntegralSolver1D::IntegralSolver1D(Function function_, DomainCartesian domain_, Method method_) : IntegrationSolver(function_, domain_, method_) {} +IntegralSolver1D::IntegralSolver1D(FunctionRntoR function_, DomainCartesian domain_, Method method_) : IntegrationSolver(function_, domain_, method_) {} IntegralSolver1D::~IntegralSolver1D() {} double IntegralSolver1D::Compute() { a = domain.boundaries[0][0]; b = domain.boundaries[0][1]; - n = (double)domain.subdivision1D; + n = (double)domain.subdivision[0]; type = method.name; if (type == "Midpoint") { return this->IntegrationMidpoint(); } if (type == "Trapz") { return this->IntegrationTrapeze(); } if (type == "Simpson") { return this->IntegrationSimpson(); } else { OutOfRangeException error("This integration method doesn't exist."); error.PrintDebug(); exit(0); } } //Midpoint method: double IntegralSolver1D::IntegrationMidpoint() { double result = 0; double size = (b-a)/n; for (int i = 0; i < n; i++){ vector inputVector; inputVector.assign(1,size/2+i*size); result += size*function.GetResult(inputVector); } return result; } //Trapeze method: double IntegralSolver1D::IntegrationTrapeze() { double result = 0; double size = (b-a)/n; for (int i = 0; i < n; i++){ vector arg1; arg1.assign(1, size*i); vector arg2; arg2.assign(1, size*(i+1)); result += size*( function.GetResult(arg1) + function.GetResult(arg2) )/2; } return result; } //Simpson Method: double IntegralSolver1D::IntegrationSimpson() { double result = 0; double size = (b-a)/n; for (int i = 0; i < n; i++){ vector arg1; vector arg2; vector arg3; arg1.assign(1, size*i); arg2.assign(1, size/2+i*size); arg3.assign(1, size*(i+1)); result += size/6 * (function.GetResult(arg1) + 4*function.GetResult(arg2) + function.GetResult(arg3) ); } return result; } diff --git a/IntegralSolver1D.hpp b/IntegralSolver1D.hpp index 503e519..a7c23d4 100644 --- a/IntegralSolver1D.hpp +++ b/IntegralSolver1D.hpp @@ -1,31 +1,33 @@ #ifndef PROJECT_INTEGRALSOLVER1D_HPP #define PROJECT_INTEGRALSOLVER1D_HPP #include "IntegrationSolver.hpp" #include "DomainCartesian.hpp" +#include "FunctionRntoR.hpp" #include -class IntegralSolver1D : public IntegrationSolver { +class IntegralSolver1D : public IntegrationSolver { public: //constructor, deconstructor - IntegralSolver1D(Function function_, DomainCartesian domain_, Method method_); + IntegralSolver1D(FunctionRntoR function_, DomainCartesian domain_, Method method_); virtual ~IntegralSolver1D(); //integration methods double IntegrationMidpoint(); double IntegrationTrapeze(); double IntegrationSimpson(); // Get result method double Compute() override; private: + double a; double b; double n; std::string type; }; #endif //PROJECT_INTEGRALSOLVER1D_HPP diff --git a/IntegralSolver2D.cpp b/IntegralSolver2D.cpp index ec21f75..a75c626 100644 --- a/IntegralSolver2D.cpp +++ b/IntegralSolver2D.cpp @@ -1,247 +1,247 @@ -// -//#include "IntegralSolver2D.hpp" -//#include -// -//// Constructor and destructor -//IntegralSolver2D::IntegralSolver2D(Function function_, DomainCartesian domain_, Method method_) : IntegrationSolver(function_, domain_, method_){} -// -//IntegralSolver2D::~IntegralSolver2D() {} -// -//// Get result method -//double IntegralSolver2D::Compute() { -// -// // Method that will be used -// type = method.name; -// -// // Extracting the boundaries of the domain and subdivision -// a = domain.boundaries[0][0]; -// b = domain.boundaries[0][1]; -// c = domain.boundaries[1][0]; -// d = domain.boundaries[1][1]; -// n = domain.subdivision[0]; // Number of sub-intervals in the interval [a,b] of X -// m = domain.subdivision[1]; // Number of sub-intervals in the interval [c,d] of Y -// -// // Computing of the result the method given by type -// if (type == "Midpoint") { -// -// return this->IntegrationMidpoint(); -// -// } -// -// if (type == "Trapz") { -// -// return this->IntegrationTrapeze(); -// -// } -// -// if (type == "Simpson") { -// -// return this->IntegrationSimpson(); -// -// } -// -// else { -// OutOfRangeException error("This integration method doesn't exist."); -// error.PrintDebug(); -// exit(0); -// } -// -//} -// -///* Midpoint method -// * -// * For each cell, the function value in the middle is computed and multiplied by the area of the cell. -// * -// */ -//double IntegralSolver2D::IntegrationMidpoint() { -// -// double result = 0; -// double sizeX = (b - a) / n; // Size of the cell on the X axis -// double sizeY = (d - c) / m; // Size of the cell on the Y axis -// -// // Iteration on each cell, -// for (int i = 0; i < n; i++){ -// -// for (int j = 0; j < m; j++){ -// -// // Position where to evaluate the function -// vector arg; -// arg.push_back(i*sizeX + sizeX/2); -// arg.push_back(j*sizeY + sizeY/2); -// -// result += sizeX * sizeY * function.GetResult(arg); -// -// } -// -// } -// -// return result; -// -//} -// -///* Trapeze method -// * -// * For each cell, takes the average function values from the corners and multiply it by the area of the cell -// * -// */ -//double IntegralSolver2D::IntegrationTrapeze() { -// -// double result = 0; -// double sizeX = (b - a) / n; // Size of the cell on the X axis -// double sizeY = (d - c) / m; // Size of the cell on the Y axis -// -// // Iteration on each cell -// for (int i = 0; i < n; i++){ -// -// for (int j = 0; j < m; j++) { -// -// // Positions of the corner where to evaluate the function -// vector corner1; -// corner1.push_back(i*sizeX); -// corner1.push_back(j*sizeY); -// -// vector corner2; -// corner2.push_back((i+1)*sizeX); -// corner2.push_back(j*sizeY); -// -// vector corner3; -// corner3.push_back(i*sizeX); -// corner3.push_back((j+1)*sizeY); -// -// vector corner4; -// corner4.push_back((i+1)*sizeX); -// corner4.push_back((j+1)*sizeY); -// -// result += sizeX * sizeY * (function.GetResult(corner1) + function.GetResult(corner2) -// + function.GetResult(corner3) + function.GetResult(corner4)) / 4; -// } -// -// } -// -// return result; -// -//} -// -///* Simpson method -// * -// * Algorithm taken from : http://mathfaculty.fullerton.edu/mathews/n2003/SimpsonsRule2DMod.html -// * -// * Uses a quadratic approximation of the function for each cell and compute its integral on the cell domain -// * -// */ -//double IntegralSolver2D::IntegrationSimpson() { -// -// double result = 0; -// double h = (b - a) / (2 * n); -// double k = (d - c) / (2 * m); -// -// // Vector that will contains some of the position where to evaluate the function -// vector a_const; -// a_const.push_back(a); -// a_const.push_back(c); -// -// vector c_const; -// c_const.push_back(a); -// c_const.push_back(d); -// -// vector b_const; -// b_const.push_back(b); -// b_const.push_back(c); -// -// vector d_const; -// d_const.push_back(a); -// d_const.push_back(d); -// -// result += function.GetResult(a_const) + function.GetResult(c_const) -// + function.GetResult(b_const) + function.GetResult(d_const); -// -// for (int j = 1; j <= n; j++){ -// -// a_const[1] = c + (2*j-1) * k; -// b_const[1] = c + (2*j-1) * k; -// result += 4*function.GetResult(a_const) + 4*function.GetResult(b_const); -// -// } -// -// for (int j = 1; j <= n-1; j++){ -// -// a_const[1] = c + (2*j) * k; -// b_const[1] = c + (2*j) * k; -// result += 2*function.GetResult(a_const)+ 2*function.GetResult(b_const); -// -// } -// -// for (int i = 1; i <= m; i++){ -// -// c_const[0] = a + (2*i-1) * k; -// d_const[0] = a + (2*i-1) * k; -// result += 4*function.GetResult(c_const) + 4*function.GetResult(d_const); -// -// } -// for (int i = 1; i <= m-1; i++){ -// -// c_const[0] = a + (2*i) * k; -// d_const[0] = a + (2*i) * k; -// result += 2*function.GetResult(c_const) + 2*function.GetResult(d_const); -// -// } -// -// for (int i = 1; i <= n; i++){ -// -// for (int j = 1; j <= m; j++){ -// -// // Position where to evaluate the function -// vector arg; -// arg.push_back(a + (2 * i - 1) * h); -// arg.push_back(c + (2 * j - 1) * k); -// -// result += 16 * function.GetResult(arg); -// -// } -// -// } -// for (int i = 1; i <= n-1; i++){ -// -// for (int j = 1; j <= m; j++){ -// -// // Position where to evaluate the function -// vector arg; -// arg.push_back(a + (2*i-1) * h); -// arg.push_back(c + (2*j) * k); -// result += 8*function.GetResult(arg); -// -// } -// -// } -// for (int i = 1; i <= n; i++){ -// -// for (int j = 1; j <= m-1; j++){ -// -// // Position where to evaluate the function -// vector arg; -// arg.push_back(a + (2*i) * h); -// arg.push_back(c + (2*j-1) * k); -// result += 8*function.GetResult(arg); -// -// } -// -// } -// -// for (int i = 1; i <= n-1; i++){ -// -// for (int j = 1; j <= m-1; j++){ -// -// // Position where to evaluate the function -// vector arg; -// arg.push_back(a + (2*i) * h); -// arg.push_back(c + (2*j) * k); -// result += 4 * function.GetResult(arg); -// -// } -// -// } -// -// result = result * h * k / 9; -// -// return result; -//} + +#include "IntegralSolver2D.hpp" +#include + +// Constructor and destructor +IntegralSolver2D::IntegralSolver2D(FunctionRntoR function_, DomainCartesian domain_, Method method_) : IntegrationSolver(function_, domain_, method_){} + +IntegralSolver2D::~IntegralSolver2D() {} + +// Get result method +double IntegralSolver2D::Compute() { + + // Method that will be used + type = method.name; + + // Extracting the boundaries of the domain and subdivision + a = domain.boundaries[0][0]; + b = domain.boundaries[0][1]; + c = domain.boundaries[1][0]; + d = domain.boundaries[1][1]; + n = domain.subdivision[0]; // Number of sub-intervals in the interval [a,b] of X + m = domain.subdivision[1]; // Number of sub-intervals in the interval [c,d] of Y + + // Computing of the result the method given by type + if (type == "Midpoint") { + + return this->IntegrationMidpoint(); + + } + + if (type == "Trapz") { + + return this->IntegrationTrapeze(); + + } + + if (type == "Simpson") { + + return this->IntegrationSimpson(); + + } + + else { + OutOfRangeException error("This integration method doesn't exist."); + error.PrintDebug(); + exit(0); + } + +} + +/* Midpoint method + * + * For each cell, the function value in the middle is computed and multiplied by the area of the cell. + * + */ +double IntegralSolver2D::IntegrationMidpoint() { + + double result = 0; + double sizeX = (b - a) / n; // Size of the cell on the X axis + double sizeY = (d - c) / m; // Size of the cell on the Y axis + + // Iteration on each cell, + for (int i = 0; i < n; i++){ + + for (int j = 0; j < m; j++){ + + // Position where to evaluate the function + vector arg; + arg.push_back(i*sizeX + sizeX/2); + arg.push_back(j*sizeY + sizeY/2); + + result += sizeX * sizeY * function.GetResult(arg); + + } + + } + + return result; + +} + +/* Trapeze method + * + * For each cell, takes the average function values from the corners and multiply it by the area of the cell + * + */ +double IntegralSolver2D::IntegrationTrapeze() { + + double result = 0; + double sizeX = (b - a) / n; // Size of the cell on the X axis + double sizeY = (d - c) / m; // Size of the cell on the Y axis + + // Iteration on each cell + for (int i = 0; i < n; i++){ + + for (int j = 0; j < m; j++) { + + // Positions of the corner where to evaluate the function + vector corner1; + corner1.push_back(i*sizeX); + corner1.push_back(j*sizeY); + + vector corner2; + corner2.push_back((i+1)*sizeX); + corner2.push_back(j*sizeY); + + vector corner3; + corner3.push_back(i*sizeX); + corner3.push_back((j+1)*sizeY); + + vector corner4; + corner4.push_back((i+1)*sizeX); + corner4.push_back((j+1)*sizeY); + + result += sizeX * sizeY * (function.GetResult(corner1) + function.GetResult(corner2) + + function.GetResult(corner3) + function.GetResult(corner4)) / 4; + } + + } + + return result; + +} + +/* Simpson method + * + * Algorithm taken from : http://mathfaculty.fullerton.edu/mathews/n2003/SimpsonsRule2DMod.html + * + * Uses a quadratic approximation of the function for each cell and compute its integral on the cell domain + * + */ +double IntegralSolver2D::IntegrationSimpson() { + + double result = 0; + double h = (b - a) / (2 * n); + double k = (d - c) / (2 * m); + + // Vector that will contains some of the position where to evaluate the function + vector a_const; + a_const.push_back(a); + a_const.push_back(c); + + vector c_const; + c_const.push_back(a); + c_const.push_back(d); + + vector b_const; + b_const.push_back(b); + b_const.push_back(c); + + vector d_const; + d_const.push_back(a); + d_const.push_back(d); + + result += function.GetResult(a_const) + function.GetResult(c_const) + + function.GetResult(b_const) + function.GetResult(d_const); + + for (int j = 1; j <= n; j++){ + + a_const[1] = c + (2*j-1) * k; + b_const[1] = c + (2*j-1) * k; + result += 4*function.GetResult(a_const) + 4*function.GetResult(b_const); + + } + + for (int j = 1; j <= n-1; j++){ + + a_const[1] = c + (2*j) * k; + b_const[1] = c + (2*j) * k; + result += 2*function.GetResult(a_const)+ 2*function.GetResult(b_const); + + } + + for (int i = 1; i <= m; i++){ + + c_const[0] = a + (2*i-1) * k; + d_const[0] = a + (2*i-1) * k; + result += 4*function.GetResult(c_const) + 4*function.GetResult(d_const); + + } + for (int i = 1; i <= m-1; i++){ + + c_const[0] = a + (2*i) * k; + d_const[0] = a + (2*i) * k; + result += 2*function.GetResult(c_const) + 2*function.GetResult(d_const); + + } + + for (int i = 1; i <= n; i++){ + + for (int j = 1; j <= m; j++){ + + // Position where to evaluate the function + vector arg; + arg.push_back(a + (2 * i - 1) * h); + arg.push_back(c + (2 * j - 1) * k); + + result += 16 * function.GetResult(arg); + + } + + } + for (int i = 1; i <= n-1; i++){ + + for (int j = 1; j <= m; j++){ + + // Position where to evaluate the function + vector arg; + arg.push_back(a + (2*i-1) * h); + arg.push_back(c + (2*j) * k); + result += 8*function.GetResult(arg); + + } + + } + for (int i = 1; i <= n; i++){ + + for (int j = 1; j <= m-1; j++){ + + // Position where to evaluate the function + vector arg; + arg.push_back(a + (2*i) * h); + arg.push_back(c + (2*j-1) * k); + result += 8*function.GetResult(arg); + + } + + } + + for (int i = 1; i <= n-1; i++){ + + for (int j = 1; j <= m-1; j++){ + + // Position where to evaluate the function + vector arg; + arg.push_back(a + (2*i) * h); + arg.push_back(c + (2*j) * k); + result += 4 * function.GetResult(arg); + + } + + } + + result = result * h * k / 9; + + return result; +} diff --git a/IntegralSolver2D.hpp b/IntegralSolver2D.hpp index 92ad5bb..803eb21 100644 --- a/IntegralSolver2D.hpp +++ b/IntegralSolver2D.hpp @@ -1,59 +1,60 @@ -///* -// * Contains methods for evaluating a definite integral of a function R2 -> R defined on a rectangular domain with a -// * regular subdivision (all cells are the same). -// * -// * Input : - Function object with f : R2 -> R (vector of two double in input -// * and a double in return) -// * - Domain object with a boundaries vector with 2 vector of 2 double -// * each -// * - Method object with the name of the integration method to use : -// * - "Midpoint" -// * - "Trapz" -// * - "Simpson" -// * Contains the following methods : - IntegrationMidpoint() - Integration method that return a result as -// * as a double -// * - IntegrationTrapeze() - Integration method that return a result as -// * as a double -// * - IntegrationSimpson() - Integration method that return a result as -// * as a double -// * - GetResult() - Return the result value of the solver -// * -// */ -//#ifndef PROJECT_INTEGRALSOLVER2D_HPP -//#define PROJECT_INTEGRALSOLVER2D_HPP -// -//#include "IntegrationSolver.hpp" -//#include "DomainCartesian.hpp" -//#include -// -//class IntegralSolver2D : public IntegrationSolver { -//public: -// // Constructor and destructor -// IntegralSolver2D(Function function_, DomainCartesian domain_, Method method_); -// virtual ~IntegralSolver2D(); -// -// // Compute method -// double Compute() override; -// -// // Integration methods -// double IntegrationMidpoint(); -// double IntegrationTrapeze(); -// double IntegrationSimpson(); -// -//private: -// -// // Boundaries -// double a; -// double b; -// double c; -// double d; -// -// // Subdivision of the intervals -// double n; -// double m; -// -// std::string type; -// -//}; -// -//#endif //PROJECT_INTEGRALSOLVER2D_HPP +/* + * Contains methods for evaluating a definite integral of a function R2 -> R defined on a rectangular domain with a + * regular subdivision (all cells are the same). + * + * Input : - Function object with f : R2 -> R (vector of two double in input + * and a double in return) + * - Domain object with a boundaries vector with 2 vector of 2 double + * each + * - Method object with the name of the integration method to use : + * - "Midpoint" + * - "Trapz" + * - "Simpson" + * Contains the following methods : - IntegrationMidpoint() - Integration method that return a result as + * as a double + * - IntegrationTrapeze() - Integration method that return a result as + * as a double + * - IntegrationSimpson() - Integration method that return a result as + * as a double + * - GetResult() - Return the result value of the solver + * + */ +#ifndef PROJECT_INTEGRALSOLVER2D_HPP +#define PROJECT_INTEGRALSOLVER2D_HPP + +#include "IntegrationSolver.hpp" +#include "DomainCartesian.hpp" +#include "FunctionRntoR.hpp" +#include + +class IntegralSolver2D : public IntegrationSolver { +public: + // Constructor and destructor + IntegralSolver2D(FunctionRntoR function_, DomainCartesian domain_, Method method_); + virtual ~IntegralSolver2D(); + + // Compute method + double Compute() override; + + // Integration methods + double IntegrationMidpoint(); + double IntegrationTrapeze(); + double IntegrationSimpson(); + +private: + + // Boundaries + double a; + double b; + double c; + double d; + + // Subdivision of the intervals + double n; + double m; + + std::string type; + +}; + +#endif //PROJECT_INTEGRALSOLVER2D_HPP diff --git a/IntegrationSolver.hpp b/IntegrationSolver.hpp index b04e6f1..c14860b 100644 --- a/IntegrationSolver.hpp +++ b/IntegrationSolver.hpp @@ -1,67 +1,67 @@ /* * Created by Tristan Liardon on 02.12.2018. * * IntegrationSolver object needs a function to integrate on a domain with a given method * * The function is created using a Function-object, the domain is created using a Domain-object, the method is created * using a Method-object * * The result is computed at the creation of the IntegrationSolver-object * * Method : * - GetResult() : Return the result of the integral * - Compute() : Order the computation of the integral * */ #ifndef PCSC_PROJET_INTEGRATIONSOLVER_HPP #define PCSC_PROJET_INTEGRATIONSOLVER_HPP #include "Function.hpp" #include "DomainCartesian.hpp" #include "Method.hpp" -template +template class IntegrationSolver { public: // Constructor and destructor // IntegrationSolver(); - IntegrationSolver(Function function_, T domain_, Method method_); + IntegrationSolver(FunctionT function_, DomainT domain_, Method method_); // virtual ~IntegrationSolver(); // Get the result double GetResult(); virtual double Compute() = 0; - Function function; - T domain; + FunctionT function; + DomainT domain; Method method; double result; }; -template -inline IntegrationSolver::IntegrationSolver(Function function_, T domain_, Method method_) { +template +inline IntegrationSolver::IntegrationSolver(FunctionT function_, DomainT domain_, Method method_) { function = function_; domain = domain_; method = method_; result = NAN; } -template -double IntegrationSolver::GetResult() { +template +double IntegrationSolver::GetResult() { if (isnan(result) == 1) { result = this->Compute(); } return result; } #endif //PCSC_PROJET_INTEGRATIONSOLVER_HPP diff --git a/cmake-build-debug/CMakeFiles/Makefile.cmake b/cmake-build-debug/CMakeFiles/Makefile.cmake index c118225..7f0419c 100644 --- a/cmake-build-debug/CMakeFiles/Makefile.cmake +++ b/cmake-build-debug/CMakeFiles/Makefile.cmake @@ -1,129 +1,53 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.12 # The generator used is: set(CMAKE_DEPENDS_GENERATOR "Unix Makefiles") # The top level Makefile was generated from the following files: set(CMAKE_MAKEFILE_DEPENDS "CMakeCache.txt" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeCCompiler.cmake.in" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeCCompilerABI.c" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeCInformation.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeCXXCompiler.cmake.in" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeCXXCompilerABI.cpp" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeCXXInformation.cmake" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeCommonLanguageInclude.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeCompilerIdDetection.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeDetermineCCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeDetermineCXXCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeDetermineCompileFeatures.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeDetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeDetermineCompilerABI.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeDetermineCompilerId.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeDetermineRCCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeDetermineSystem.cmake" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeFindBinUtils.cmake" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeFindCodeBlocks.cmake" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeGenericSystem.cmake" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeInitializeConfigs.cmake" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeLanguageInformation.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeParseImplicitLinkInfo.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeRCCompiler.cmake.in" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeRCInformation.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeSystem.cmake.in" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeSystemSpecificInformation.cmake" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeSystemSpecificInitialize.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeTestCCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeTestCXXCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeTestCompilerCommon.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeTestRCCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/CMakeUnixFindMake.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/ADSP-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/ARMCC-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/AppleClang-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/Borland-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/Bruce-C-DetermineCompiler.cmake" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/CMakeCommonCompilerMacros.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/Clang-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/Clang-DetermineCompilerInternal.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/Compaq-C-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/Cray-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/Embarcadero-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/Fujitsu-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/GHS-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/GNU-C-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/GNU-C-FeatureTests.cmake" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/GNU-C.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/GNU-CXX-FeatureTests.cmake" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/GNU-CXX.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/GNU-FindBinUtils.cmake" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/GNU.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/HP-C-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/HP-CXX-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/IAR-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/Intel-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/MIPSpro-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/MSVC-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/NVIDIA-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/PGI-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/PathScale-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/SCO-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/SDCC-C-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/SunPro-C-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/TI-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/Watcom-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/XL-C-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/XL-CXX-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/zOS-C-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Internal/FeatureTesting.cmake" - "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Platform/CYGWIN-Determine-CXX.cmake" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Platform/CYGWIN-GNU-C.cmake" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Platform/CYGWIN-GNU-CXX.cmake" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Platform/CYGWIN-GNU.cmake" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Platform/CYGWIN-windres.cmake" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Platform/CYGWIN.cmake" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/Platform/UnixPaths.cmake" "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/share/cmake-3.12.3/Modules/ProcessorCount.cmake" "../CMakeLists.txt" "CMakeFiles/3.12.3/CMakeCCompiler.cmake" "CMakeFiles/3.12.3/CMakeCXXCompiler.cmake" "CMakeFiles/3.12.3/CMakeRCCompiler.cmake" "CMakeFiles/3.12.3/CMakeSystem.cmake" - "CMakeFiles/feature_tests.c" - "CMakeFiles/feature_tests.cxx" ) # The corresponding makefile is: set(CMAKE_MAKEFILE_OUTPUTS "Makefile" "CMakeFiles/cmake.check_cache" ) # Byproducts of CMake generate step: set(CMAKE_MAKEFILE_PRODUCTS - "CMakeFiles/3.12.3/CMakeSystem.cmake" - "CMakeFiles/3.12.3/CMakeCCompiler.cmake" - "CMakeFiles/3.12.3/CMakeCXXCompiler.cmake" - "CMakeFiles/3.12.3/CMakeRCCompiler.cmake" - "CMakeFiles/3.12.3/CMakeCCompiler.cmake" - "CMakeFiles/3.12.3/CMakeCXXCompiler.cmake" "CMakeFiles/CMakeDirectoryInformation.cmake" ) # Dependency information for all targets: set(CMAKE_DEPEND_INFO_FILES "CMakeFiles/guggisberg_liardon_numerical_integration.dir/DependInfo.cmake" ) diff --git a/cmake-build-debug/CMakeFiles/Makefile2 b/cmake-build-debug/CMakeFiles/Makefile2 index d19cb78..dc413dc 100644 --- a/cmake-build-debug/CMakeFiles/Makefile2 +++ b/cmake-build-debug/CMakeFiles/Makefile2 @@ -1,113 +1,113 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.12 # Default target executed when no arguments are given to make. default_target: all .PHONY : default_target # The main recursive all target all: .PHONY : all # The main recursive preinstall target preinstall: .PHONY : preinstall # The main recursive clean target clean: .PHONY : clean #============================================================================= # Special targets provided by cmake. # Disable implicit rules so canonical targets will work. .SUFFIXES: # Remove some rules from gmake that .SUFFIXES does not remove. SUFFIXES = .SUFFIXES: .hpux_make_needs_suffix_list # Suppress display of executed commands. $(VERBOSE).SILENT: # A target that is always out of date. cmake_force: .PHONY : cmake_force #============================================================================= # Set environment variables for the build. # The shell in which to execute make rules. SHELL = /bin/sh # The CMake executable. CMAKE_COMMAND = "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/bin/cmake.exe" # The command to remove a file. RM = "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/bin/cmake.exe" -E remove -f # Escaping for special characters. EQUALS = = # The top-level source directory on which CMake was run. CMAKE_SOURCE_DIR = /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug #============================================================================= # Target rules for target CMakeFiles/guggisberg_liardon_numerical_integration.dir # All Build rule for target. CMakeFiles/guggisberg_liardon_numerical_integration.dir/all: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/depend $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/build - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles --progress-num=1,2,3,4,5,6,7,8,9,10,11 "Built target guggisberg_liardon_numerical_integration" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles --progress-num=1,2,3,4,5,6,7,8,9,10,11,12,13 "Built target guggisberg_liardon_numerical_integration" .PHONY : CMakeFiles/guggisberg_liardon_numerical_integration.dir/all # Include target in all. all: CMakeFiles/guggisberg_liardon_numerical_integration.dir/all .PHONY : all # Build rule for subdir invocation for target. CMakeFiles/guggisberg_liardon_numerical_integration.dir/rule: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles 11 + $(CMAKE_COMMAND) -E cmake_progress_start /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles 13 $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/guggisberg_liardon_numerical_integration.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles 0 .PHONY : CMakeFiles/guggisberg_liardon_numerical_integration.dir/rule # Convenience name for target. guggisberg_liardon_numerical_integration: CMakeFiles/guggisberg_liardon_numerical_integration.dir/rule .PHONY : guggisberg_liardon_numerical_integration # clean rule for target. CMakeFiles/guggisberg_liardon_numerical_integration.dir/clean: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/clean .PHONY : CMakeFiles/guggisberg_liardon_numerical_integration.dir/clean # clean rule for target. clean: CMakeFiles/guggisberg_liardon_numerical_integration.dir/clean .PHONY : clean #============================================================================= # Special targets to cleanup operation of make. # Special rule to run CMake to check the build system integrity. # No rule that depends on this can have commands that come from listfiles # because they might be regenerated. cmake_check_build_system: $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 .PHONY : cmake_check_build_system diff --git a/cmake-build-debug/CMakeFiles/clion-log.txt b/cmake-build-debug/CMakeFiles/clion-log.txt index c187ec1..6ba3b48 100644 --- a/cmake-build-debug/CMakeFiles/clion-log.txt +++ b/cmake-build-debug/CMakeFiles/clion-log.txt @@ -1,18 +1,4 @@ "C:\Users\Tristan Liardon\.CLion2018.2\system\cygwin_cmake\bin\cmake.exe" -DCMAKE_BUILD_TYPE=Debug -G "CodeBlocks - Unix Makefiles" /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration --- The C compiler identification is GNU 7.3.0 --- The CXX compiler identification is GNU 7.3.0 --- Check for working C compiler: /usr/bin/cc --- Check for working C compiler: /usr/bin/cc -- works --- Detecting C compiler ABI info --- Detecting C compiler ABI info - done --- Detecting C compile features --- Detecting C compile features - done --- Check for working CXX compiler: /usr/bin/c++.exe --- Check for working CXX compiler: /usr/bin/c++.exe -- works --- Detecting CXX compiler ABI info --- Detecting CXX compiler ABI info - done --- Detecting CXX compile features --- Detecting CXX compile features - done -- Configuring done -- Generating done -- Build files have been written to: /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug diff --git a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/CXX.includecache b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/CXX.includecache index 136978c..8bbb3c9 100644 --- a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/CXX.includecache +++ b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/CXX.includecache @@ -1,116 +1,90 @@ #IncludeRegexLine: ^[ ]*[#%][ ]*(include|import)[ ]*[<"]([^">]+)([">]) #IncludeRegexScan: ^.*$ #IncludeRegexComplain: ^$ #IncludeRegexTransform: -/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Domain.cpp -Domain.hpp -/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Domain.hpp - /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Domain.hpp vector - iostream - OutOfRangeException.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.hpp Exception.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.hpp -/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/DomainCartesian.cpp -DomainCartesian.hpp -/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/DomainCartesian.hpp - /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/DomainCartesian.hpp Domain.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Domain.hpp -/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.cpp -iostream -- -Exception.hpp -/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.hpp - /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.hpp string - -/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Function.cpp -Function.hpp -/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Function.hpp - /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Function.hpp vector - cmath - OutOfRangeException.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.hpp Exception.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.hpp -/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver1D.cpp -IntegralSolver1D.hpp -/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver1D.hpp +/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/FunctionRntoR.hpp Function.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Function.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver1D.hpp IntegrationSolver.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegrationSolver.hpp DomainCartesian.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/DomainCartesian.hpp +FunctionRntoR.hpp +/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/FunctionRntoR.hpp vector - -/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver2D.cpp - /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver2D.hpp - -/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegrationSolver.cpp IntegrationSolver.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegrationSolver.hpp +DomainCartesian.hpp +/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/DomainCartesian.hpp +FunctionRntoR.hpp +/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/FunctionRntoR.hpp +vector +- /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegrationSolver.hpp Function.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Function.hpp DomainCartesian.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/DomainCartesian.hpp Method.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Method.hpp -/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Method.cpp -Method.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Method.hpp - -/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Method.hpp -iostream -- - -/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.cpp -OutOfRangeException.hpp -/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.hpp iostream - /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.hpp Exception.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/main.cpp iostream - math.h - IntegralSolver1D.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver1D.hpp IntegralSolver2D.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver2D.hpp iostream - vector - diff --git a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/DependInfo.cmake b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/DependInfo.cmake index 6f1700f..3633470 100644 --- a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/DependInfo.cmake +++ b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/DependInfo.cmake @@ -1,30 +1,32 @@ # The set of languages for which implicit dependencies are needed: set(CMAKE_DEPENDS_LANGUAGES "CXX" ) # The set of files for implicit dependencies of each language: set(CMAKE_DEPENDS_CHECK_CXX "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Domain.cpp" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/DomainCartesian.cpp" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.cpp" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.o" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Function.cpp" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o" + "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/FunctionRntoR.cpp" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.o" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver1D.cpp" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver2D.cpp" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegrationSolver.cpp" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Method.cpp" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.o" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.cpp" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.o" + "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/functioncopy.cpp" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.o" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/main.cpp" "/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o" ) set(CMAKE_CXX_COMPILER_ID "GNU") # The include file search paths: set(CMAKE_CXX_TARGET_INCLUDE_PATH "../." ) # Targets to which this target links. set(CMAKE_TARGET_LINKED_INFO_FILES ) # Fortran module output directory. set(CMAKE_Fortran_TARGET_MODULE_DIR "") diff --git a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o index 86c08ab..fb18e6d 100644 Binary files a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o and b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o differ diff --git a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o index 3eff2ec..94ca2ca 100644 Binary files a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o and b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o differ diff --git a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o index d0dcc7a..8dfe294 100644 Binary files a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o and b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o differ diff --git a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o index 4c76f1c..72e1330 100644 Binary files a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o and b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o differ diff --git a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o index a69320a..7afe32e 100644 Binary files a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o and b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o differ diff --git a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make index 04c2ed2..02fdf8f 100644 --- a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make +++ b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make @@ -1,233 +1,263 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.12 # Delete rule output on recipe failure. .DELETE_ON_ERROR: #============================================================================= # Special targets provided by cmake. # Disable implicit rules so canonical targets will work. .SUFFIXES: # Remove some rules from gmake that .SUFFIXES does not remove. SUFFIXES = .SUFFIXES: .hpux_make_needs_suffix_list # Suppress display of executed commands. $(VERBOSE).SILENT: # A target that is always out of date. cmake_force: .PHONY : cmake_force #============================================================================= # Set environment variables for the build. # The shell in which to execute make rules. SHELL = /bin/sh # The CMake executable. CMAKE_COMMAND = "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/bin/cmake.exe" # The command to remove a file. RM = "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/bin/cmake.exe" -E remove -f # Escaping for special characters. EQUALS = = # The top-level source directory on which CMake was run. CMAKE_SOURCE_DIR = /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug # Include any dependencies generated for this target. include CMakeFiles/guggisberg_liardon_numerical_integration.dir/depend.make # Include the progress variables for this target. include CMakeFiles/guggisberg_liardon_numerical_integration.dir/progress.make # Include the compile flags for this target's objects. include CMakeFiles/guggisberg_liardon_numerical_integration.dir/flags.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o: CMakeFiles/guggisberg_liardon_numerical_integration.dir/flags.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o: ../Domain.cpp @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o -c /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Domain.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.i: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.i" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Domain.cpp > CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.i CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.s" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Domain.cpp -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.s CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o: CMakeFiles/guggisberg_liardon_numerical_integration.dir/flags.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o: ../DomainCartesian.cpp @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building CXX object CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o -c /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/DomainCartesian.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.i: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.i" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/DomainCartesian.cpp > CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.i CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.s" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/DomainCartesian.cpp -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.s CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o: CMakeFiles/guggisberg_liardon_numerical_integration.dir/flags.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o: ../Function.cpp @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building CXX object CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o -c /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Function.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.i: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.i" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Function.cpp > CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.i CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.s" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Function.cpp -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.s CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.o: CMakeFiles/guggisberg_liardon_numerical_integration.dir/flags.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.o: ../Method.cpp @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.o" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.o -c /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Method.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.i: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.i" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Method.cpp > CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.i CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.s" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Method.cpp -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.s CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o: CMakeFiles/guggisberg_liardon_numerical_integration.dir/flags.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o: ../IntegrationSolver.cpp @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Building CXX object CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o -c /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegrationSolver.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.i: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.i" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegrationSolver.cpp > CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.i CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.s" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegrationSolver.cpp -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.s CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o: CMakeFiles/guggisberg_liardon_numerical_integration.dir/flags.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o: ../IntegralSolver1D.cpp @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Building CXX object CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o -c /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver1D.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.i: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.i" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver1D.cpp > CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.i CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.s" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver1D.cpp -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.s CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o: CMakeFiles/guggisberg_liardon_numerical_integration.dir/flags.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o: ../IntegralSolver2D.cpp @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_7) "Building CXX object CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o -c /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver2D.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.i: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.i" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver2D.cpp > CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.i CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.s" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver2D.cpp -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.s CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o: CMakeFiles/guggisberg_liardon_numerical_integration.dir/flags.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o: ../main.cpp @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_8) "Building CXX object CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o -c /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/main.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.i: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.i" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/main.cpp > CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.i CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.s" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/main.cpp -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.s CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.o: CMakeFiles/guggisberg_liardon_numerical_integration.dir/flags.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.o: ../Exception.cpp @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_9) "Building CXX object CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.o" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.o -c /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.i: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.i" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.cpp > CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.i CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.s" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.cpp -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.s CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.o: CMakeFiles/guggisberg_liardon_numerical_integration.dir/flags.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.o: ../OutOfRangeException.cpp @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_10) "Building CXX object CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.o" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.o -c /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.i: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.i" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.cpp > CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.i CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.s" /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.cpp -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.s +CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.o: CMakeFiles/guggisberg_liardon_numerical_integration.dir/flags.make +CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.o: ../FunctionRntoR.cpp + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_11) "Building CXX object CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.o" + /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.o -c /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/FunctionRntoR.cpp + +CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.i" + /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/FunctionRntoR.cpp > CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.i + +CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.s" + /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/FunctionRntoR.cpp -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.s + +CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.o: CMakeFiles/guggisberg_liardon_numerical_integration.dir/flags.make +CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.o: ../functioncopy.cpp + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_12) "Building CXX object CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.o" + /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.o -c /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/functioncopy.cpp + +CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.i" + /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/functioncopy.cpp > CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.i + +CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.s" + /usr/bin/c++.exe $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/functioncopy.cpp -o CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.s + # Object files for target guggisberg_liardon_numerical_integration guggisberg_liardon_numerical_integration_OBJECTS = \ "CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o" \ "CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o" \ "CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o" \ "CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.o" \ "CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o" \ "CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o" \ "CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o" \ "CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o" \ "CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.o" \ -"CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.o" +"CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.o" \ +"CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.o" \ +"CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.o" # External object files for target guggisberg_liardon_numerical_integration guggisberg_liardon_numerical_integration_EXTERNAL_OBJECTS = guggisberg_liardon_numerical_integration.exe: CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o guggisberg_liardon_numerical_integration.exe: CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o guggisberg_liardon_numerical_integration.exe: CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o guggisberg_liardon_numerical_integration.exe: CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.o guggisberg_liardon_numerical_integration.exe: CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o guggisberg_liardon_numerical_integration.exe: CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o guggisberg_liardon_numerical_integration.exe: CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o guggisberg_liardon_numerical_integration.exe: CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o guggisberg_liardon_numerical_integration.exe: CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.o guggisberg_liardon_numerical_integration.exe: CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.o +guggisberg_liardon_numerical_integration.exe: CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.o +guggisberg_liardon_numerical_integration.exe: CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.o guggisberg_liardon_numerical_integration.exe: CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make guggisberg_liardon_numerical_integration.exe: CMakeFiles/guggisberg_liardon_numerical_integration.dir/link.txt - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_11) "Linking CXX executable guggisberg_liardon_numerical_integration.exe" + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_13) "Linking CXX executable guggisberg_liardon_numerical_integration.exe" $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/guggisberg_liardon_numerical_integration.dir/link.txt --verbose=$(VERBOSE) # Rule to build all files generated by this target. CMakeFiles/guggisberg_liardon_numerical_integration.dir/build: guggisberg_liardon_numerical_integration.exe .PHONY : CMakeFiles/guggisberg_liardon_numerical_integration.dir/build CMakeFiles/guggisberg_liardon_numerical_integration.dir/clean: $(CMAKE_COMMAND) -P CMakeFiles/guggisberg_liardon_numerical_integration.dir/cmake_clean.cmake .PHONY : CMakeFiles/guggisberg_liardon_numerical_integration.dir/clean CMakeFiles/guggisberg_liardon_numerical_integration.dir/depend: cd /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/DependInfo.cmake --color=$(COLOR) .PHONY : CMakeFiles/guggisberg_liardon_numerical_integration.dir/depend diff --git a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/cmake_clean.cmake b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/cmake_clean.cmake index 4821457..65d478f 100644 --- a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/cmake_clean.cmake +++ b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/cmake_clean.cmake @@ -1,20 +1,22 @@ file(REMOVE_RECURSE "CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o" "CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o" "CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o" "CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.o" "CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o" "CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o" "CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o" "CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o" "CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.o" "CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.o" + "CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.o" + "CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.o" "guggisberg_liardon_numerical_integration.pdb" "guggisberg_liardon_numerical_integration.exe" "libguggisberg_liardon_numerical_integration.dll.a" ) # Per-language clean rules from dependency scanning. foreach(lang CXX) include(CMakeFiles/guggisberg_liardon_numerical_integration.dir/cmake_clean_${lang}.cmake OPTIONAL) endforeach() diff --git a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/depend.internal b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/depend.internal index 4035e13..41082bf 100644 --- a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/depend.internal +++ b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/depend.internal @@ -1,61 +1,80 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.12 CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Domain.cpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Domain.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Domain.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/DomainCartesian.cpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/DomainCartesian.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.o /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.cpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Function.cpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Function.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.hpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.o + /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.hpp + /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Function.hpp + /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/FunctionRntoR.cpp + /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/FunctionRntoR.hpp + /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Domain.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/DomainCartesian.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Function.hpp + /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/FunctionRntoR.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver1D.cpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver1D.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegrationSolver.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Method.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o + /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Domain.hpp + /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/DomainCartesian.hpp + /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.hpp + /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Function.hpp + /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/FunctionRntoR.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver2D.cpp + /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver2D.hpp + /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegrationSolver.hpp + /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Method.hpp + /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Domain.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/DomainCartesian.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Function.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegrationSolver.cpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegrationSolver.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Method.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.o /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Method.cpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Method.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.o /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.cpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.hpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.o + /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/functioncopy.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Domain.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/DomainCartesian.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Exception.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Function.hpp + /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/FunctionRntoR.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver1D.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegralSolver2D.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/IntegrationSolver.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/Method.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/OutOfRangeException.hpp /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/main.cpp diff --git a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/depend.make b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/depend.make index 055d74f..fea258b 100644 --- a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/depend.make +++ b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/depend.make @@ -1,61 +1,80 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.12 CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o: ../Domain.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o: ../Domain.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o: ../Exception.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o: ../OutOfRangeException.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o: ../Domain.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o: ../DomainCartesian.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o: ../DomainCartesian.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o: ../Exception.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o: ../OutOfRangeException.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.o: ../Exception.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.o: ../Exception.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o: ../Exception.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o: ../Function.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o: ../Function.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o: ../OutOfRangeException.hpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.o: ../Exception.hpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.o: ../Function.hpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.o: ../FunctionRntoR.cpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.o: ../FunctionRntoR.hpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.o: ../OutOfRangeException.hpp + CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o: ../Domain.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o: ../DomainCartesian.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o: ../Exception.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o: ../Function.hpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o: ../FunctionRntoR.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o: ../IntegralSolver1D.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o: ../IntegralSolver1D.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o: ../IntegrationSolver.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o: ../Method.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o: ../OutOfRangeException.hpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o: ../Domain.hpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o: ../DomainCartesian.hpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o: ../Exception.hpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o: ../Function.hpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o: ../FunctionRntoR.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o: ../IntegralSolver2D.cpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o: ../IntegralSolver2D.hpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o: ../IntegrationSolver.hpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o: ../Method.hpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o: ../OutOfRangeException.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o: ../Domain.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o: ../DomainCartesian.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o: ../Exception.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o: ../Function.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o: ../IntegrationSolver.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o: ../IntegrationSolver.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o: ../Method.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o: ../OutOfRangeException.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.o: ../Method.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.o: ../Method.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.o: ../Exception.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.o: ../OutOfRangeException.cpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.o: ../OutOfRangeException.hpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.o: ../functioncopy.cpp + CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o: ../Domain.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o: ../DomainCartesian.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o: ../Exception.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o: ../Function.hpp +CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o: ../FunctionRntoR.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o: ../IntegralSolver1D.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o: ../IntegralSolver2D.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o: ../IntegrationSolver.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o: ../Method.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o: ../OutOfRangeException.hpp CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o: ../main.cpp diff --git a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/link.txt b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/link.txt index a77f60e..71e52ab 100644 --- a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/link.txt +++ b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/link.txt @@ -1 +1 @@ -/usr/bin/c++.exe -g -Wl,--enable-auto-import CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.o -o guggisberg_liardon_numerical_integration.exe -Wl,--out-implib,libguggisberg_liardon_numerical_integration.dll.a -Wl,--major-image-version,0,--minor-image-version,0 +/usr/bin/c++.exe -g -Wl,--enable-auto-import CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.o CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.o -o guggisberg_liardon_numerical_integration.exe -Wl,--out-implib,libguggisberg_liardon_numerical_integration.dll.a -Wl,--major-image-version,0,--minor-image-version,0 diff --git a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o index 2b6bc8c..caf8682 100644 Binary files a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o and b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o differ diff --git a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/progress.make b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/progress.make index eeadf29..7a1b005 100644 --- a/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/progress.make +++ b/cmake-build-debug/CMakeFiles/guggisberg_liardon_numerical_integration.dir/progress.make @@ -1,12 +1,14 @@ CMAKE_PROGRESS_1 = 1 CMAKE_PROGRESS_2 = 2 CMAKE_PROGRESS_3 = 3 CMAKE_PROGRESS_4 = 4 CMAKE_PROGRESS_5 = 5 CMAKE_PROGRESS_6 = 6 CMAKE_PROGRESS_7 = 7 CMAKE_PROGRESS_8 = 8 CMAKE_PROGRESS_9 = 9 CMAKE_PROGRESS_10 = 10 CMAKE_PROGRESS_11 = 11 +CMAKE_PROGRESS_12 = 12 +CMAKE_PROGRESS_13 = 13 diff --git a/cmake-build-debug/CMakeFiles/progress.marks b/cmake-build-debug/CMakeFiles/progress.marks index b4de394..b1bd38b 100644 --- a/cmake-build-debug/CMakeFiles/progress.marks +++ b/cmake-build-debug/CMakeFiles/progress.marks @@ -1 +1 @@ -11 +13 diff --git a/cmake-build-debug/Makefile b/cmake-build-debug/Makefile index 1975dcf..2138b98 100644 --- a/cmake-build-debug/Makefile +++ b/cmake-build-debug/Makefile @@ -1,448 +1,508 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.12 # Default target executed when no arguments are given to make. default_target: all .PHONY : default_target # Allow only one "make -f Makefile2" at a time, but pass parallelism. .NOTPARALLEL: #============================================================================= # Special targets provided by cmake. # Disable implicit rules so canonical targets will work. .SUFFIXES: # Remove some rules from gmake that .SUFFIXES does not remove. SUFFIXES = .SUFFIXES: .hpux_make_needs_suffix_list # Suppress display of executed commands. $(VERBOSE).SILENT: # A target that is always out of date. cmake_force: .PHONY : cmake_force #============================================================================= # Set environment variables for the build. # The shell in which to execute make rules. SHELL = /bin/sh # The CMake executable. CMAKE_COMMAND = "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/bin/cmake.exe" # The command to remove a file. RM = "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/bin/cmake.exe" -E remove -f # Escaping for special characters. EQUALS = = # The top-level source directory on which CMake was run. CMAKE_SOURCE_DIR = /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug #============================================================================= # Targets provided globally by CMake. # Special rule for the target rebuild_cache rebuild_cache: @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/bin/cmake.exe" -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) .PHONY : rebuild_cache # Special rule for the target rebuild_cache rebuild_cache/fast: rebuild_cache .PHONY : rebuild_cache/fast # Special rule for the target edit_cache edit_cache: @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..." "/cygdrive/c/Users/Tristan Liardon/.CLion2018.2/system/cygwin_cmake/bin/cmake.exe" -E echo No\ interactive\ CMake\ dialog\ available. .PHONY : edit_cache # Special rule for the target edit_cache edit_cache/fast: edit_cache .PHONY : edit_cache/fast # The main all target all: cmake_check_build_system $(CMAKE_COMMAND) -E cmake_progress_start /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles/progress.marks $(MAKE) -f CMakeFiles/Makefile2 all $(CMAKE_COMMAND) -E cmake_progress_start /cygdrive/c/pcsc_projet/guggisberg-liardon-numerical-integration/cmake-build-debug/CMakeFiles 0 .PHONY : all # The main clean target clean: $(MAKE) -f CMakeFiles/Makefile2 clean .PHONY : clean # The main clean target clean/fast: clean .PHONY : clean/fast # Prepare targets for installation. preinstall: all $(MAKE) -f CMakeFiles/Makefile2 preinstall .PHONY : preinstall # Prepare targets for installation. preinstall/fast: $(MAKE) -f CMakeFiles/Makefile2 preinstall .PHONY : preinstall/fast # clear depends depend: $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 .PHONY : depend #============================================================================= # Target rules for targets named guggisberg_liardon_numerical_integration # Build rule for target. guggisberg_liardon_numerical_integration: cmake_check_build_system $(MAKE) -f CMakeFiles/Makefile2 guggisberg_liardon_numerical_integration .PHONY : guggisberg_liardon_numerical_integration # fast build rule for target. guggisberg_liardon_numerical_integration/fast: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/build .PHONY : guggisberg_liardon_numerical_integration/fast Domain.o: Domain.cpp.o .PHONY : Domain.o # target to build an object file Domain.cpp.o: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.o .PHONY : Domain.cpp.o Domain.i: Domain.cpp.i .PHONY : Domain.i # target to preprocess a source file Domain.cpp.i: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.i .PHONY : Domain.cpp.i Domain.s: Domain.cpp.s .PHONY : Domain.s # target to generate assembly for a file Domain.cpp.s: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/Domain.cpp.s .PHONY : Domain.cpp.s DomainCartesian.o: DomainCartesian.cpp.o .PHONY : DomainCartesian.o # target to build an object file DomainCartesian.cpp.o: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.o .PHONY : DomainCartesian.cpp.o DomainCartesian.i: DomainCartesian.cpp.i .PHONY : DomainCartesian.i # target to preprocess a source file DomainCartesian.cpp.i: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.i .PHONY : DomainCartesian.cpp.i DomainCartesian.s: DomainCartesian.cpp.s .PHONY : DomainCartesian.s # target to generate assembly for a file DomainCartesian.cpp.s: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/DomainCartesian.cpp.s .PHONY : DomainCartesian.cpp.s Exception.o: Exception.cpp.o .PHONY : Exception.o # target to build an object file Exception.cpp.o: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.o .PHONY : Exception.cpp.o Exception.i: Exception.cpp.i .PHONY : Exception.i # target to preprocess a source file Exception.cpp.i: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.i .PHONY : Exception.cpp.i Exception.s: Exception.cpp.s .PHONY : Exception.s # target to generate assembly for a file Exception.cpp.s: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/Exception.cpp.s .PHONY : Exception.cpp.s Function.o: Function.cpp.o .PHONY : Function.o # target to build an object file Function.cpp.o: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.o .PHONY : Function.cpp.o Function.i: Function.cpp.i .PHONY : Function.i # target to preprocess a source file Function.cpp.i: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.i .PHONY : Function.cpp.i Function.s: Function.cpp.s .PHONY : Function.s # target to generate assembly for a file Function.cpp.s: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/Function.cpp.s .PHONY : Function.cpp.s +FunctionRntoR.o: FunctionRntoR.cpp.o + +.PHONY : FunctionRntoR.o + +# target to build an object file +FunctionRntoR.cpp.o: + $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.o +.PHONY : FunctionRntoR.cpp.o + +FunctionRntoR.i: FunctionRntoR.cpp.i + +.PHONY : FunctionRntoR.i + +# target to preprocess a source file +FunctionRntoR.cpp.i: + $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.i +.PHONY : FunctionRntoR.cpp.i + +FunctionRntoR.s: FunctionRntoR.cpp.s + +.PHONY : FunctionRntoR.s + +# target to generate assembly for a file +FunctionRntoR.cpp.s: + $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/FunctionRntoR.cpp.s +.PHONY : FunctionRntoR.cpp.s + IntegralSolver1D.o: IntegralSolver1D.cpp.o .PHONY : IntegralSolver1D.o # target to build an object file IntegralSolver1D.cpp.o: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.o .PHONY : IntegralSolver1D.cpp.o IntegralSolver1D.i: IntegralSolver1D.cpp.i .PHONY : IntegralSolver1D.i # target to preprocess a source file IntegralSolver1D.cpp.i: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.i .PHONY : IntegralSolver1D.cpp.i IntegralSolver1D.s: IntegralSolver1D.cpp.s .PHONY : IntegralSolver1D.s # target to generate assembly for a file IntegralSolver1D.cpp.s: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver1D.cpp.s .PHONY : IntegralSolver1D.cpp.s IntegralSolver2D.o: IntegralSolver2D.cpp.o .PHONY : IntegralSolver2D.o # target to build an object file IntegralSolver2D.cpp.o: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.o .PHONY : IntegralSolver2D.cpp.o IntegralSolver2D.i: IntegralSolver2D.cpp.i .PHONY : IntegralSolver2D.i # target to preprocess a source file IntegralSolver2D.cpp.i: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.i .PHONY : IntegralSolver2D.cpp.i IntegralSolver2D.s: IntegralSolver2D.cpp.s .PHONY : IntegralSolver2D.s # target to generate assembly for a file IntegralSolver2D.cpp.s: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegralSolver2D.cpp.s .PHONY : IntegralSolver2D.cpp.s IntegrationSolver.o: IntegrationSolver.cpp.o .PHONY : IntegrationSolver.o # target to build an object file IntegrationSolver.cpp.o: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.o .PHONY : IntegrationSolver.cpp.o IntegrationSolver.i: IntegrationSolver.cpp.i .PHONY : IntegrationSolver.i # target to preprocess a source file IntegrationSolver.cpp.i: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.i .PHONY : IntegrationSolver.cpp.i IntegrationSolver.s: IntegrationSolver.cpp.s .PHONY : IntegrationSolver.s # target to generate assembly for a file IntegrationSolver.cpp.s: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/IntegrationSolver.cpp.s .PHONY : IntegrationSolver.cpp.s Method.o: Method.cpp.o .PHONY : Method.o # target to build an object file Method.cpp.o: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.o .PHONY : Method.cpp.o Method.i: Method.cpp.i .PHONY : Method.i # target to preprocess a source file Method.cpp.i: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.i .PHONY : Method.cpp.i Method.s: Method.cpp.s .PHONY : Method.s # target to generate assembly for a file Method.cpp.s: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/Method.cpp.s .PHONY : Method.cpp.s OutOfRangeException.o: OutOfRangeException.cpp.o .PHONY : OutOfRangeException.o # target to build an object file OutOfRangeException.cpp.o: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.o .PHONY : OutOfRangeException.cpp.o OutOfRangeException.i: OutOfRangeException.cpp.i .PHONY : OutOfRangeException.i # target to preprocess a source file OutOfRangeException.cpp.i: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.i .PHONY : OutOfRangeException.cpp.i OutOfRangeException.s: OutOfRangeException.cpp.s .PHONY : OutOfRangeException.s # target to generate assembly for a file OutOfRangeException.cpp.s: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/OutOfRangeException.cpp.s .PHONY : OutOfRangeException.cpp.s +functioncopy.o: functioncopy.cpp.o + +.PHONY : functioncopy.o + +# target to build an object file +functioncopy.cpp.o: + $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.o +.PHONY : functioncopy.cpp.o + +functioncopy.i: functioncopy.cpp.i + +.PHONY : functioncopy.i + +# target to preprocess a source file +functioncopy.cpp.i: + $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.i +.PHONY : functioncopy.cpp.i + +functioncopy.s: functioncopy.cpp.s + +.PHONY : functioncopy.s + +# target to generate assembly for a file +functioncopy.cpp.s: + $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/functioncopy.cpp.s +.PHONY : functioncopy.cpp.s + main.o: main.cpp.o .PHONY : main.o # target to build an object file main.cpp.o: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.o .PHONY : main.cpp.o main.i: main.cpp.i .PHONY : main.i # target to preprocess a source file main.cpp.i: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.i .PHONY : main.cpp.i main.s: main.cpp.s .PHONY : main.s # target to generate assembly for a file main.cpp.s: $(MAKE) -f CMakeFiles/guggisberg_liardon_numerical_integration.dir/build.make CMakeFiles/guggisberg_liardon_numerical_integration.dir/main.cpp.s .PHONY : main.cpp.s # Help Target help: @echo "The following are some of the valid targets for this Makefile:" @echo "... all (the default if no target is provided)" @echo "... clean" @echo "... depend" @echo "... rebuild_cache" @echo "... guggisberg_liardon_numerical_integration" @echo "... edit_cache" @echo "... Domain.o" @echo "... Domain.i" @echo "... Domain.s" @echo "... DomainCartesian.o" @echo "... DomainCartesian.i" @echo "... DomainCartesian.s" @echo "... Exception.o" @echo "... Exception.i" @echo "... Exception.s" @echo "... Function.o" @echo "... Function.i" @echo "... Function.s" + @echo "... FunctionRntoR.o" + @echo "... FunctionRntoR.i" + @echo "... FunctionRntoR.s" @echo "... IntegralSolver1D.o" @echo "... IntegralSolver1D.i" @echo "... IntegralSolver1D.s" @echo "... IntegralSolver2D.o" @echo "... IntegralSolver2D.i" @echo "... IntegralSolver2D.s" @echo "... IntegrationSolver.o" @echo "... IntegrationSolver.i" @echo "... IntegrationSolver.s" @echo "... Method.o" @echo "... Method.i" @echo "... Method.s" @echo "... OutOfRangeException.o" @echo "... OutOfRangeException.i" @echo "... OutOfRangeException.s" + @echo "... functioncopy.o" + @echo "... functioncopy.i" + @echo "... functioncopy.s" @echo "... main.o" @echo "... main.i" @echo "... main.s" .PHONY : help #============================================================================= # Special targets to cleanup operation of make. # Special rule to run CMake to check the build system integrity. # No rule that depends on this can have commands that come from listfiles # because they might be regenerated. cmake_check_build_system: $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 .PHONY : cmake_check_build_system diff --git a/cmake-build-debug/guggisberg_liardon_numerical_integration.cbp b/cmake-build-debug/guggisberg_liardon_numerical_integration.cbp index 0c6f326..27ecc9e 100644 --- a/cmake-build-debug/guggisberg_liardon_numerical_integration.cbp +++ b/cmake-build-debug/guggisberg_liardon_numerical_integration.cbp @@ -1,149 +1,161 @@ diff --git a/main.cpp b/main.cpp index b062c77..505f8c4 100644 --- a/main.cpp +++ b/main.cpp @@ -1,86 +1,88 @@ #include #include #include "IntegralSolver1D.hpp" #include "IntegralSolver2D.hpp" #include using namespace std; #include /* USER DEFINED FUNCTION * * Input : vector of double x * Output : double * Function is defined as f : Rn -> R where n is at least 1 * */ double myFunction1D(vector x) { return x[0] * x[0]; } double myFunction2D(vector x) { - return x[0]*x[1]; + return 1/x[0]*x[1]; } int main(int argc, char *argv[]) { -// ////////// 2D test ////////// -// // Creation of the function pointer -// double (*functionPointer2D)(vector) = &myFunction2D; -// -// // Creation of the function to be integrated -// Function function2D(functionPointer2D); -// -// // Boundaries matrix -// vector> boundaries2D; -// vector dim1; -// vector dim2; -// dim1.push_back(0); -// dim1.push_back(5); -// dim2.push_back(0); -// dim2.push_back(5); -// boundaries2D.push_back(dim1); -// boundaries2D.push_back(dim2); -// -// // Subdivision vector -// vector subdivision; -// subdivision.push_back(100); -// subdivision.push_back(100); -// -// // Creation of the domain of integration, method -// DomainCartesian domain2D(boundaries2D, subdivision); -// Method method2D("Midpoint"); -// -// // Creation of the solver -// IntegralSolver2D Integration2D(function2D, domain2D, method2D); -// -// // Asking to compute the result -// double result2D = Integration2D.GetResult(); -// std::cout << "Result is : " << result2D << " using " << method2D.name << "'s method" << std::endl; + ////////// 2D test ////////// + // Creation of the function pointer + double (*functionPointer2D)(vector) = &myFunction2D; + + // Creation of the function to be integrated + FunctionRntoR function2D(functionPointer2D); + + // Boundaries matrix + vector> boundaries2D; + vector dim1; + vector dim2; + dim1.push_back(1); + dim1.push_back(5); + dim2.push_back(1); + dim2.push_back(5); + boundaries2D.push_back(dim1); + boundaries2D.push_back(dim2); + + // Subdivision vector + vector subdivision; + subdivision.push_back(100); + subdivision.push_back(100); + + // Creation of the domain of integration, method + DomainCartesian domain2D(boundaries2D, subdivision); + Method method2D("Midpoint"); + + // Creation of the solver + IntegralSolver2D Integration2D(function2D, domain2D, method2D); + + // Asking to compute the result + double result2D = Integration2D.GetResult(); + std::cout << "Result is : " << result2D << " using " << method2D.name << "'s method" << std::endl; ////////// 1D test ////////// // Creation of the pointer to the function to integrate double (*functionPointer1D)(vector); functionPointer1D = &myFunction1D; // Object creation - Function function1D(functionPointer1D); + FunctionRntoR function1D(functionPointer1D); DomainCartesian domain1D(0, 5, 100); Method method1D("Trapz"); IntegralSolver1D Integration1(function1D, domain1D, method1D); // Asking to compute the result double result1D = Integration1.GetResult(); std::cout << "Result is : " << result1D << " using " << method1D.name << "'s method" << std::endl; +// std::cout << domain2D.GetNumberElements(); + return 0; }