alpha renaming and comments in Context class

src/main/scala/daisy/Context.scala

@@ -38,8 +38,10 @@ case class Context(
   specResultRangeBounds: Map[Identifier, PartialInterval] = Map(),
   specResultErrorBounds: Map[Identifier, Rational] = Map(),
 
-  analysisAbsoluteErrors: Map[Identifier, Map[Expr, Rational]]= Map(),
-  analysisRanges: Map[Identifier, Map[Expr, Interval]] = Map(),
+  // the intermediate analysis results, since we rely on having them at hand when
+  // encoding the analysis result
+  intermediateAbsoluteErrors: Map[Identifier, Map[Expr, Rational]]= Map(),
+  intermediateRanges: Map[Identifier, Map[Expr, Interval]] = Map(),
 
   // the analysed/computed roundoff errors for each function
   resultAbsoluteErrors: Map[Identifier, Rational] = Map(),

src/main/scala/daisy/analysis/RangeErrorPhase.scala

@@ -171,8 +171,8 @@ object RangeErrorPhase extends DaisyPhase with RoundoffEvaluators with IntervalS
     (ctx.copy(
       resultAbsoluteErrors = res.map(x => (x._1 -> x._2._1)),
       resultRealRanges = res.map(x => (x._1 -> x._2._2)),
-      analysisAbsoluteErrors = roundoffErrorMap,
-      analysisRanges = rangeResMap), prg)
+      intermediateAbsoluteErrors = roundoffErrorMap,
+      intermediateRanges = rangeResMap), prg)
   }
 
 

src/main/scala/daisy/backend/CertificatePhase.scala

@@ -46,10 +46,10 @@ object CertificatePhase extends DaisyPhase {
       val thePrecondition = fnc.precondition
       val theBody = fnc.body
       //must be set
-      assert (ctx.analysisAbsoluteErrors.get(fnc.id) != None)
-      val errorMap = ctx.analysisAbsoluteErrors.get(fnc.id).get
-      assert (ctx.analysisRanges.get(fnc.id) != None)
-      val rangeMap = ctx.analysisRanges.get(fnc.id).get
+      assert (ctx.intermediateAbsoluteErrors.get(fnc.id) != None)
+      val errorMap = ctx.intermediateAbsoluteErrors.get(fnc.id).get
+      assert (ctx.intermediateRanges.get(fnc.id) != None)
+      val rangeMap = ctx.intermediateRanges.get(fnc.id).get
 
       prover match {
         case Some(prv) =>