From b5c423043b7935ba8f9b0b76bfd55bd66795564f Mon Sep 17 00:00:00 2001
From: Rene Milk <rene.milk@uni-muenster.de>
Date: Thu, 8 Dec 2011 18:01:20 +0100
Subject: [PATCH] printing stuff
---
stuff/printing.hh | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/stuff/printing.hh b/stuff/printing.hh
index 06df1482e..a7143e2ac 100644
--- a/stuff/printing.hh
+++ b/stuff/printing.hh
@@ -92,16 +92,10 @@ void printSparseRowMatrixMatlabStyle(const T& arg, std::string name, stream& out
out << boost::format("\n%s =sparse( %d, %d );") % name % I % J << std::endl;
for (size_t row = 0; row < arg.rows(); row++) {
for (size_t col = 0; col < arg.cols(); col++) {
-<<<<<<< HEAD
const auto value = arg(row, col);
if (std::fabs(value) > eps)
out << name << "(" << row + 1 << "," << col + 1 << ")=" << std::setprecision(matlab_output_precision) << value
<< ";\n";
-=======
- if (std::fabs(arg(row, col)) > eps)
- out << name << "(" << row + 1 << "," << col + 1 << ")=" << std::setprecision(matlab_output_precision)
- << arg(row, col) << ";\n";
->>>>>>> some ISTL compliance
}
}
}
@@ -343,12 +337,12 @@ void printFunctionMinMax(Stream& stream, const Function& func)
template <class Matrix, class Stream>
void matrixToGnuplotStream(const Matrix& matrix, Stream& stream)
{
+ assert(false);
unsigned long nz = 0;
for (size_t row = 0; row < matrix.rows(); ++row) {
for (size_t col = 0; col < matrix.cols(); ++col) {
if (matrix.find(row, col))
- assert(false);
- // stream << row << "\t" << col << "\t" << matrix( row, col ) << std::endl;
+ stream << row << "\t" << col << "\t" << matrix(row, col) << std::endl;
}
nz += matrix.numNonZeros(row);
stream << "#non zeros in row " << row << " " << matrix.numNonZeros(row) << " (of " << matrix.cols() << " cols)\n";
--
GitLab