fixed ADMM issue when inequalities are emptyfuns, closes #100

alexe15 · Mar 24, 2020 · 43dbc9d · 43dbc9d
1 parent 25053ce
commit 43dbc9d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/extensions/run_ADMMnew.m b/src/extensions/run_ADMMnew.m
@@ -31,12 +31,12 @@
     iter.loc.xxCas    = SX.sym('x',nx,1);
 
     % local inequality constraints
-    sProb.locFunsCas.ggi  = sProb.locFuns.ggi{i}(iter.yyCas);
-    sProb.locFunsCas.hhi  = sProb.locFuns.hhi{i}(iter.yyCas);
+    sProb.locFunsCas.ggi{i}  = sProb.locFuns.ggi{i}(iter.yyCas);
+    sProb.locFunsCas.hhi{i}  = sProb.locFuns.hhi{i}(iter.yyCas);
 
     % output dimensions of local constraints
-    nngi{i} = size(sProb.locFunsCas.ggi,1);
-    nnhi{i} = size(sProb.locFunsCas.hhi,1);
+    nngi{i} = size(sProb.locFunsCas.ggi{i},1);
+    nnhi{i} = size(sProb.locFunsCas.hhi{i},1);
 
 
     % set up bounds for equalities/inequalities
@@ -62,7 +62,7 @@
     end
 
     % set up local solvers
-    nlp       = struct('x',iter.yyCas,'f',ffiLocCas,'g',[sProb.locFunsCas.ggi; sProb.locFunsCas.hhi],'p',pCas);
+    nlp       = struct('x',iter.yyCas,'f',ffiLocCas,'g',[sProb.locFunsCas.ggi{i}; sProb.locFunsCas.hhi{i}],'p',pCas);
     nnlp{i}   = nlpsol('solver',opts.locSol,nlp);
 
 end