Loading include/gdcpp.h +3 −3 Original line number Diff line number Diff line Loading @@ -475,7 +475,7 @@ namespace gdc Vector gradientN; Vector xvalN; Scalar fvalN; Scalar gradientDot = gradient.dot(gradient); Scalar stepGrad = -gradient.dot(gradient); bool armijoCondition = false; bool wolfeCondition = false; Loading @@ -488,8 +488,8 @@ namespace gdc xvalN = xval - stepSize * gradient; fvalN = objective_(xvalN, gradientN); armijoCondition = fvalN <= fval - c1_ * stepSize * gradientDot; wolfeCondition = gradient.dot(gradientN) <= c2_ * gradientDot; armijoCondition = fvalN <= fval + c1_ * stepSize * stepGrad; wolfeCondition = -gradient.dot(gradientN) >= c2_ * stepGrad; ++iterations; } Loading Loading
include/gdcpp.h +3 −3 Original line number Diff line number Diff line Loading @@ -475,7 +475,7 @@ namespace gdc Vector gradientN; Vector xvalN; Scalar fvalN; Scalar gradientDot = gradient.dot(gradient); Scalar stepGrad = -gradient.dot(gradient); bool armijoCondition = false; bool wolfeCondition = false; Loading @@ -488,8 +488,8 @@ namespace gdc xvalN = xval - stepSize * gradient; fvalN = objective_(xvalN, gradientN); armijoCondition = fvalN <= fval - c1_ * stepSize * gradientDot; wolfeCondition = gradient.dot(gradientN) <= c2_ * gradientDot; armijoCondition = fvalN <= fval + c1_ * stepSize * stepGrad; wolfeCondition = -gradient.dot(gradientN) >= c2_ * stepGrad; ++iterations; } Loading