KCL-Planning · kaizerw · Nov 12, 2018
diff --git a/parser b/parser
diff --git a/src/Action.o b/src/Action.o
diff --git a/src/DebugWriteController.o b/src/DebugWriteController.o
diff --git a/src/Environment.o b/src/Environment.o
diff --git a/src/Events.o b/src/Events.o
diff --git a/src/FuncAnalysis.o b/src/FuncAnalysis.o
diff --git a/src/FuncExp.o b/src/FuncExp.o
diff --git a/src/LaTeXSupport.o b/src/LaTeXSupport.o
diff --git a/src/Ownership.o b/src/Ownership.o
diff --git a/src/Plan.o b/src/Plan.o
diff --git a/src/Polynomial.cpp b/src/Polynomial.cpp
@@ -140,7 +140,10 @@ void Intervals::writeOffset(double t) const
 	}
 	else
 	{
-      if(LaTeX) *report << "$";
+        if(LaTeX)
+	{
+		*report << "$";
+	}
 		for(vector< pair<intervalEnd,intervalEnd> >::const_iterator i = intervals.begin(); i != intervals.end();)
 		{
 
@@ -154,7 +157,10 @@ void Intervals::writeOffset(double t) const
 			if(++i != intervals.end()) {if(LaTeX) *report << "\\cup"; else cout << " U ";};
 
 		};
-       if(LaTeX) *report << "$";
+        if(LaTeX)
+	{
+		*report << "$";
+	}
 	};
 
 

diff --git a/src/Polynomial.o b/src/Polynomial.o
diff --git a/src/PrettyPrinter.o b/src/PrettyPrinter.o
diff --git a/src/Proposition.cpp b/src/Proposition.cpp
@@ -3074,7 +3074,10 @@ string Comparison::getExprnString(const expression * e,const Environment & bs) c
 		s += ")";
 
 
-      if(LaTeX) return "\\exprn{"+ s + "}";
+  	        if(LaTeX)
+		{
+			return "\\exprn{"+ s + "}";
+		}
 		return s;
 
 	};
@@ -3146,8 +3149,11 @@ string Comparison::getExprnString(const expression * e,const Environment & bs, c
 	{
 		const FuncExp * fexp = s->getValidator()->fef.buildFuncExp(dynamic_cast<const func_term*>(e),bs);
 
-      if(LaTeX) return "\\exprn{"+ toString(fexp)  + "}$[=" + toString(fexp->evaluate(s)) + "]$";
-		return toString(fexp) + "[=" + toString(fexp->evaluate(s)) + "]";
+        if(LaTeX)
+	{
+		return "\\exprn{"+ toString(fexp)  + "}$[=" + toString(fexp->evaluate(s)) + "]$";
+	}
+	return toString(fexp) + "[=" + toString(fexp->evaluate(s)) + "]";
 
 	};
 

diff --git a/src/Proposition.o b/src/Proposition.o
diff --git a/src/RepairAdvice.o b/src/RepairAdvice.o
diff --git a/src/RobustAnalyse.cpp b/src/RobustAnalyse.cpp
@@ -688,7 +688,10 @@ void RobustPlanAnalyser::calculatePNERobustness(double & robustnessOfPlan,double
 
 string getPlanStepString(const plan_step * ps)
 {
-    if(ps == 0) return "";
+    if(ps == 0)
+    {
+	return "";
+    }
 		string act = "("+ps->op_sym->getName();
 		for(typed_symbol_list<const_symbol>::const_iterator j = ps->params->begin();
 			j != ps->params->end(); ++j)

diff --git a/src/RobustAnalyse.o b/src/RobustAnalyse.o
diff --git a/src/State.o b/src/State.o
diff --git a/src/TrajectoryConstraints.o b/src/TrajectoryConstraints.o
diff --git a/src/TypedAnalyser.o b/src/TypedAnalyser.o
diff --git a/src/TypedAnalysis.o b/src/TypedAnalysis.o
diff --git a/src/Utils.o b/src/Utils.o
diff --git a/src/Validator.cpp b/src/Validator.cpp
@@ -3213,10 +3213,13 @@ pair<const plan_step *,pair<bool,bool> > PlanRepair::repairPlanOneAction(const p
 
 
             if(planRepairValidator->getErrorLog().getConditions().size() == 0)
-	      {  if(planRepairValidator->checkGoal(theGoal)) //goalSatisfied = true;
+	      {  if(planRepairValidator->checkGoal(theGoal))
+		 {
+                    //goalSatisfied = true;
                     //cout << "Satisfied "<< actionName << " at time "<<actionTime<<"\n";
-               actionFixed = true; planRepaired = true; break;
-            };
+                    actionFixed = true; planRepaired = true; break;
+                 }
+	    };
 
 
             //get unique set of actions that are flawed

diff --git a/src/Validator.o b/src/Validator.o
diff --git a/src/main.o b/src/main.o