Commit dead913a authored by Anastasiia's avatar Anastasiia

Merge remote-tracking branch 'origin/relative' into relative

parents 13fe9a31 49ba92d2
......@@ -142,7 +142,7 @@ object RelativeErrorPhase extends DaisyPhase with Subdivision with ErrorFunction
case "taylor" => getRelErrorTaylorApprox(relErrorExpr, inputValMap, bodyReal, ctx)
case "naive" => getRelErrorNaive(relErrorExpr, inputValMap, bodyReal, ctx)
}
reporter.warning("Failed on " + tmpList.size + " sub-domain(s)")
reporter.warning("Failed on " + tmpList.distinct.size + " sub-domain(s)")
val list = mergeIntervals(tmpList, inputValMap)
// if returned None or too many subintervals where failed to compute relError,
// say it is not possible to compute
......@@ -234,7 +234,7 @@ object RelativeErrorPhase extends DaisyPhase with Subdivision with ErrorFunction
val tmp = evaluateOpt(tmpExpr, interval, rangeMethod)
reporter.debug("err on " + removeDeltasFromMap(interval) + s" is $tmp")
if (tmp.isEmpty)
if (!listFailInterval.contains(interval)) listFailInterval = listFailInterval :+ interval
if (!listFailInterval.contains(interval) && !listFailed.contains(interval)) listFailInterval = listFailInterval :+ interval
tmp
})
}
......
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