Commit ba5e1fb4 authored by Anastasiia's avatar Anastasiia

Merge branch 'relative' into 'relative'

Relative

See merge request !100
parents 29c81f50 adc89cf3
......@@ -142,7 +142,8 @@ object RelativeErrorPhase extends DaisyPhase with Subdivision with ErrorFunction
reporter.info("Computing absolute error on these sub-intervals.")
for (mapEntry <- list) {
// here we compute the abs error for intervals where rel error is not possible
val absError = getAbsError(bodyReal, mapEntry, inputErrorMap, uniformPrecision)
//todo put abs error computation back
val absError = Rational.zero//getAbsError(bodyReal, mapEntry, inputErrorMap, uniformPrecision)
reporter.info(s"For intervals $mapEntry, absError: $absError, time: " +
(System.currentTimeMillis - time))
}
......@@ -199,7 +200,7 @@ object RelativeErrorPhase extends DaisyPhase with Subdivision with ErrorFunction
reporter.info("Computing the error ...")
// fixme for div-by-zero benchmarks subdivision parameter should be greater than 0
val remainderMap = getEqualSubintervals(inputValMap, divLimit, 4)
val remainderMap = getEqualSubintervals(inputValMap, divLimit, 0)
val taylorRemainder = getTaylorRemainder(relErrorExpr, remainderMap)
reporter.info(s"The taylor remainder value is $taylorRemainder")
......@@ -215,7 +216,7 @@ object RelativeErrorPhase extends DaisyPhase with Subdivision with ErrorFunction
case x @ Epsilon(id) => List(evaluateOpt(tmpExpr, inputValMap, rangeMethod))
case x @ Variable(id) => List(evaluateOpt(tmpExpr, inputValMap, rangeMethod))
case x @ RealLiteral(r) => List(evaluateOpt(tmpExpr, inputValMap, rangeMethod))
case _ => newSet.par.map(interval => {
case _ => newSet.map(interval => {
val tmp = evaluateOpt(tmpExpr, interval, rangeMethod)
reporter.debug("err on "+removeDeltasFromMap(interval)+s" is $tmp")
if (tmp.isEmpty)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment