Skip to content

Commit 0269a56

Browse files
committed
modified postProcess again..
1 parent 1e1fe40 commit 0269a56

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/Base.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ function postProcess!(n;kwargs...)
838838
# even if n.r.ocp.status==:Infeasible try to get solution. For the case that user may want to look at results to see where constraints where violated
839839
# in this case set => n.s.ocp.evalConstraints = true
840840
# http://jump.readthedocs.io/en/latest/refmodel.html#solve-status
841-
if !Init && (n.s.ocp.evalConstraints || ((n.r.ocp.status==:Optimal) || (n.r.ocp.status==:UserLimit)))
841+
if !Init #&& (n.s.ocp.evalConstraints || ((n.r.ocp.status==:Optimal) || (n.r.ocp.status==:UserLimit)))
842842
if n.s.ocp.integrationMethod==:ps
843843
if n.s.ocp.finalTimeDV
844844
t = [scale_tau(n.ocp.ts[int],0.0,getvalue(n.ocp.tf)) for int in 1:n.ocp.Ni] # scale time from [-1,1] to [t0,tf]
@@ -875,7 +875,7 @@ function postProcess!(n;kwargs...)
875875

876876
elseif n.s.mpc.on && n.s.mpc.lastOptimal && !n.s.mpc.onlyOptimal
877877
if !n.s.ocp.save
878-
error("This functionality currently needs to have n.s.save==true")
878+
error("This functionality currently needs to have n.s.ocp.save==true")
879879
end
880880
optIdx = find(n.r.ocp.dfsOpt[:status].==:Optimal)[end] # use the last :Optimal solution
881881
@show n.r.ocp.dfsOpt

0 commit comments

Comments
 (0)