diff --git a/libs/tbdefs.hpp b/libs/tbdefs.hpp index 233c3104..5524195c 100644 --- a/libs/tbdefs.hpp +++ b/libs/tbdefs.hpp @@ -21,6 +21,20 @@ #include #include +template +std::ostream& operator<<(std::ostream& os, const std::valarray& v) +{ + os << "["; + if (v.size() > 0) { + os << v[0]; + for (size_t i = 1; i < v.size(); ++i) { + os << ", " << v[i]; + } + } + os << "]"; + return os; +} + /************************************** * MACROS & DEFINES * **************************************/ diff --git a/make.in b/make.in index cbb9a62f..4cb3eb06 100644 --- a/make.in +++ b/make.in @@ -9,7 +9,7 @@ MAKEDEPEND=g++ -M $(CXXFLAGS) # Lapack includes and linking ILAPACK= -LLAPACK=-llapack +LLAPACK=-lopenblas TBSRC=../libs/ LDFLAGS=-L$(TBSRC) -ltoolbox $(LLAPACK) diff --git a/tools/dimproj.cpp b/tools/dimproj.cpp index bdef5421..cdba4460 100644 --- a/tools/dimproj.cpp +++ b/tools/dimproj.cpp @@ -124,7 +124,9 @@ int main(int argc, char**argv) else { csv2floats(fdhd,tfpars); fhdpars=tfpars; - std::cerr<<"high-dim pars"< sat(0.0,2); csv2floats(tempopts,sat); - std::cerr<<" simulated annealing ops: "<