Skip to content
Snippets Groups Projects
Commit e0b40e9f authored by Oliver Sander's avatar Oliver Sander Committed by sander
Browse files

remove trailing whitespace

[[Imported from SVN: r11760]]
parent 0026ef4b
Branches
Tags
No related merge requests found
......@@ -6,7 +6,7 @@ DiscFuncType TrustRegionGSStep<OperatorType, DiscFuncType>::getSol()
}
template<class OperatorType, class DiscFuncType>
inline
inline
double TrustRegionGSStep<OperatorType, DiscFuncType>::
residual(unsigned int index, int blockIndex) const
{
......@@ -21,7 +21,7 @@ residual(unsigned int index, int blockIndex) const
double r = (*this->rhs_)[index][blockIndex];
ColumnIterator cIt = mat[index].template begin();
ColumnIterator cEndIt = mat[index].template end();
for (; cIt!=cEndIt; ++cIt) {
// r_i -= A_ij x_j
// r -= (*cIt)[blockIndex] * (*this->x_)[cIt.index()];
......@@ -34,7 +34,7 @@ residual(unsigned int index, int blockIndex) const
r -= (*cIt)[blockIndex][i] * (*this->x_)[cIt.index()][i];
}
}
//std::cout << "+++ index " << index << " rhs: " << (*this->rhs_)[index] << std::endl;
......@@ -94,7 +94,7 @@ void TrustRegionGSStep<OperatorType, DiscFuncType>::iterate()
// double proMin = 0.5*diag*obstacles[i].upper(j)*obstacles[i].upper(j) - r*obstacles[i].upper(j);
//assert(trueMin < proMin);
x = obstacles[i].upper(j);
}
}
// Debug: check for energy decrease
//double energy = computeEnergy(mat, *this->x_, *this->rhs_);
......@@ -102,14 +102,14 @@ void TrustRegionGSStep<OperatorType, DiscFuncType>::iterate()
} else {
//printf("%d %d konkav\n", i, j);
// 1d problem is concave or linear.
// 1d problem is concave or linear.
// Minimum is attained at one of the boundaries
double lBound = obstacles[i].lower(j);
double uBound = obstacles[i].upper(j);
double lValue = 0.5*diag*lBound*lBound - r*lBound;
double uValue = 0.5*diag*uBound*uBound - r*uBound;
#if 0
double max = 0.5*diag*(r/diag)*(r/diag) - r*r/diag;
assert(max >= lValue);
......@@ -123,7 +123,7 @@ void TrustRegionGSStep<OperatorType, DiscFuncType>::iterate()
//assert(oldEnergy+1e-6>=energy);
}
}
}
......
......@@ -23,7 +23,7 @@
typedef typename DiscFuncType::field_type field_type;
public:
//! Default constructor. Doesn't init anything
TrustRegionGSStep() {}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment