mirror of
https://gitlab.com/libeigen/eigen.git
synced 2026-04-10 11:34:33 +08:00
merge my Dynamic -> -1 change
This commit is contained in:
@@ -86,9 +86,11 @@ struct ei_intersector_helper2
|
||||
bool intersectObject(const Object2 &obj) { return intersector.intersectObjectObject(stored, obj); }
|
||||
Object1 stored;
|
||||
Intersector &intersector;
|
||||
private:
|
||||
ei_intersector_helper2& operator=(const ei_intersector_helper2&);
|
||||
};
|
||||
|
||||
/** Given two BVH's, runs the query on their cartesian product encapsulated by \a intersector.
|
||||
/** Given two BVH's, runs the query on their Cartesian product encapsulated by \a intersector.
|
||||
* The Intersector type must provide the following members: \code
|
||||
bool intersectVolumeVolume(const BVH1::Volume &v1, const BVH2::Volume &v2) //returns true if product of volumes intersects the query
|
||||
bool intersectVolumeObject(const BVH1::Volume &v1, const BVH2::Object &o2) //returns true if the volume-object product intersects the query
|
||||
@@ -207,6 +209,8 @@ struct ei_minimizer_helper1
|
||||
Scalar minimumOnObject(const Object1 &obj) { return minimizer.minimumOnObjectObject(obj, stored); }
|
||||
Object2 stored;
|
||||
Minimizer &minimizer;
|
||||
private:
|
||||
ei_minimizer_helper1& operator=(const ei_minimizer_helper1&) {}
|
||||
};
|
||||
|
||||
template<typename Volume2, typename Object2, typename Object1, typename Minimizer>
|
||||
|
||||
@@ -323,6 +323,8 @@ template<typename Derived> struct MatrixExponentialReturnValue
|
||||
|
||||
protected:
|
||||
const Derived& m_src;
|
||||
private:
|
||||
MatrixExponentialReturnValue& operator=(const MatrixExponentialReturnValue&);
|
||||
};
|
||||
|
||||
template<typename Derived>
|
||||
|
||||
@@ -116,9 +116,10 @@ class MatrixFunction<MatrixType, 0>
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
const MatrixType& m_A; /**< \brief Reference to argument of matrix function. */
|
||||
StemFunction *m_f; /**< \brief Stem function for matrix function under consideration */
|
||||
|
||||
MatrixFunction& operator=(const MatrixFunction&);
|
||||
};
|
||||
|
||||
|
||||
@@ -182,6 +183,8 @@ class MatrixFunction<MatrixType, 1>
|
||||
* separation constant is set to 0.1, a value taken from the
|
||||
* paper by Davies and Higham. */
|
||||
static const RealScalar separation() { return static_cast<RealScalar>(0.1); }
|
||||
|
||||
MatrixFunction& operator=(const MatrixFunction&);
|
||||
};
|
||||
|
||||
/** \brief Constructor.
|
||||
@@ -526,6 +529,8 @@ template<typename Derived> class MatrixFunctionReturnValue
|
||||
private:
|
||||
const Derived& m_A;
|
||||
StemFunction *m_f;
|
||||
|
||||
MatrixFunctionReturnValue& operator=(const MatrixFunctionReturnValue&);
|
||||
};
|
||||
|
||||
template<typename Derived>
|
||||
|
||||
@@ -124,6 +124,8 @@ private:
|
||||
Index ncfail;
|
||||
Scalar actred, prered;
|
||||
FVectorType wa1, wa2, wa3, wa4;
|
||||
|
||||
HybridNonLinearSolver& operator=(const HybridNonLinearSolver&);
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -133,6 +133,8 @@ private:
|
||||
Scalar delta;
|
||||
Scalar ratio;
|
||||
Scalar pnorm, xnorm, fnorm1, actred, dirder, prered;
|
||||
|
||||
LevenbergMarquardt& operator=(const LevenbergMarquardt&);
|
||||
};
|
||||
|
||||
template<typename FunctorType, typename Scalar>
|
||||
|
||||
@@ -70,7 +70,7 @@ void ei_qrsolv(
|
||||
/* solve the triangular system for z. if the system is */
|
||||
/* singular, then obtain a least squares solution. */
|
||||
Index nsing;
|
||||
for (nsing=0; nsing<n && sdiag[nsing]!=0; nsing++);
|
||||
for(nsing=0; nsing<n && sdiag[nsing]!=0; nsing++) {}
|
||||
|
||||
wa.tail(n-nsing).setZero();
|
||||
s.topLeftCorner(nsing, nsing).transpose().template triangularView<Upper>().solveInPlace(wa.head(nsing));
|
||||
|
||||
@@ -130,6 +130,8 @@ public:
|
||||
}
|
||||
private:
|
||||
Scalar epsfcn;
|
||||
|
||||
NumericalDiff& operator=(const NumericalDiff&);
|
||||
};
|
||||
|
||||
//vim: ai ts=4 sts=4 et sw=4
|
||||
|
||||
Reference in New Issue
Block a user