Finally use built-in stable unique (requires R2012...)

yalmip · Sep 3, 2024 · 36700ac · 36700ac
1 parent 3d87091
commit 36700ac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/extras/@optimizer/optimizer_precalc.m b/extras/@optimizer/optimizer_precalc.m
@@ -6,7 +6,8 @@
 sys.model.precalc.Qmap = [];
 % R2012b...
 try
-    [ii,jj,kk] = stableunique(sys.model.precalc.newmonomtable*gen_rand_hash(0,size(sys.model.precalc.newmonomtable,2),1));
+    %[ii,jj,kk] = stableunique(sys.model.precalc.newmonomtable*gen_rand_hash(0,size(sys.model.precalc.newmonomtable,2),1));
+    [ii,jj,kk] = unique(sys.model.precalc.newmonomtable*gen_rand_hash(0,size(sys.model.precalc.newmonomtable,2),1),'stable');
     sys.model.precalc.S = sparse(kk,1:length(kk),1);
     sys.model.precalc.skipped = setdiff(1:length(kk),jj);    
     sys.model.precalc.blkOneS = blkdiag(1,sys.model.precalc.S');     

diff --git a/extras/eliminatevariables.m b/extras/eliminatevariables.m
@@ -199,8 +199,10 @@
 if ~isequal(newmonomtable,model.precalc.newmonomtable)%~isempty(removethese)
     skipped = [];
     alreadyAdded = zeros(1,size(newmonomtable,1));         
-    [ii,jj,kk,skipped] = stableunique(newmonomtable*model.hashCache(1:size(newmonomtable,2)));   
-    %[ii,jj,kk,skipped] = stableunique(newmonomtable*gen_rand_hash(0,size(newmonomtable,2),1));   
+    %[ii,jj,kk,skipped] = stableunique(newmonomtable*model.hashCache(1:size(newmonomtable,2)));       
+    [ii,jj,kk] = unique(newmonomtable*model.hashCache(1:size(newmonomtable,2)),'stable');
+    skipped = setdiff(1:length(kk),jj);
+
     S = sparse(kk,1:length(kk),1);   
     model.precalc.S = S;
     model.precalc.skipped = skipped;