Commit 29d2c03b authored by Laurent Belcour's avatar Laurent Belcour
Browse files

Updating configuration file for CERES.

Correction of some DEBUG message.
parent c59aae5b
...@@ -8,3 +8,8 @@ CONFIG += ceres ...@@ -8,3 +8,8 @@ CONFIG += ceres
INCLUDEPATH += $$(ALTA)/external/build/include INCLUDEPATH += $$(ALTA)/external/build/include
LIBS += -L$$(ALTA)/external/build/lib \ LIBS += -L$$(ALTA)/external/build/lib \
-lceres -lglog -lceres -lglog
macx {
LIBS += -lamd -lcamd -lcolamd -lcholmod -lcxsparse
LIBS *= -lblas -llapack
}
...@@ -275,7 +275,7 @@ ptr<data> plugins_manager::get_data(const std::string& n) ...@@ -275,7 +275,7 @@ ptr<data> plugins_manager::get_data(const std::string& n)
{ {
if(n.empty()) if(n.empty())
{ {
#ifndef DEBUG #ifdef DEBUG
std::cout << "<<DEBUG>> no data plugin specified, returning a vertial_segment loader" << std::endl; std::cout << "<<DEBUG>> no data plugin specified, returning a vertial_segment loader" << std::endl;
#endif #endif
return new vertical_segment(); return new vertical_segment();
......
...@@ -101,8 +101,16 @@ int main(int argc, char** argv) ...@@ -101,8 +101,16 @@ int main(int argc, char** argv)
// Import data // Import data
ptr<data> d_in = plugins_manager::get_data(args["in-data"]) ; ptr<data> d_in = plugins_manager::get_data(args["in-data"]) ;
d_in->load(args["input"], args); d_in->load(args["input"], args);
if(!d_in)
{
std::cout << "<<INFO>> input data will be treated as ALTA format" << std::endl;
}
ptr<data> d_out = plugins_manager::get_data(args["out-data"]) ; ptr<data> d_out = plugins_manager::get_data(args["out-data"]) ;
if(!d_out)
{
std::cout << "<<INFO>> data will be outputed to ALTA format" << std::endl;
}
if(!d_in && !d_out) if(!d_in && !d_out)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment