Rename restrictions

src/bisection-example-new.cc

@@ -113,23 +113,23 @@ typename Functional::SmallVector minimise(
   typename Functional::SmallVector tmp;
 
   J.A.mv(descDir, tmp);                // Av
-  double const rest_A = tmp * descDir; // <Av,v>
+  double const JRestA = tmp * descDir; // <Av,v>
 
   J.A.mv(x, tmp);                              // Au
-  double const rest_b = (J.b - tmp) * descDir; // <b-Au,v>
+  double const JRestb = (J.b - tmp) * descDir; // <b-Au,v>
 
   typedef MyNonlinearity<Functional::SmallVector::dimension,
                          typename Functional::FunctionType> MyNonlinearityType;
   MyNonlinearityType phi;
   typedef DirectionalConvexFunction<MyNonlinearityType>
   MyDirectionalConvexFunctionType;
-  MyDirectionalConvexFunctionType rest(rest_A, rest_b, phi, x, descDir);
+  MyDirectionalConvexFunctionType JRest(JRestA, JRestb, phi, x, descDir);
 
   // FIXME: default values are used
   Bisection bisection;
   int count;
   // FIXME: does x_old = 1 make any sense?!
-  double const m = bisection.minimize(rest, 0.0, 1.0, count);
+  double const m = bisection.minimize(JRest, 0.0, 1.0, count);
   Dune::dverb << "Number of iterations in the bisection method: " << count
               << std::endl;
   ;