Merge pull request #1516 from tholden/develop-imgmodel

johanlofberg · web-flow · commit dae8e2992972 · 2025-08-19T07:29:40.000+02:00
Fix clash with MATLAB images toolbox class.
diff --git a/extras/@lmi/imgmodel.m b/extras/@lmi/imgmodel.m
@@ -1,7 +1,7 @@
-function [Fimage,objimage,x,y] = imagemodel(F,obj,options)
-% IMAGEMODEL Explicitely removes equality constraints from model.
+function [Fimage,objimage,x,y] = imgmodel(F,obj,options)
+% IMGMODEL Explicitely removes equality constraints from model.
 %
-% [Fi,hi,x,y] = imagemodel(F,h)
+% [Fi,hi,x,y] = imgmodel(F,h)
 %
 % Input
 %  F   : Constraint in form F(x)>0, Ax=b
diff --git a/extras/imgmodel.m b/extras/imgmodel.m
@@ -1,7 +1,7 @@
-function [Fimage,objimage,x,y] = imagemodel(F,obj,options)
-% IMAGEMODEL Explicitely removes equality constraints from model.
+function [Fimage,objimage,x,y] = imgmodel(F,obj,options)
+% IMGMODEL Explicitely removes equality constraints from model.
 %
-% [Fi,hi,x,y] = imagemodel(F,h)
+% [Fi,hi,x,y] = imgmodel(F,h)
 %
 % Input
 %  F   : Constraint in form F(x)>0, Ax=b

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-function [Fimage,objimage,x,y] = imagemodel(F,obj,options)`
`2`		`-% IMAGEMODEL Explicitely removes equality constraints from model.`
	`1`	`+function [Fimage,objimage,x,y] = imgmodel(F,obj,options)`
	`2`	`+% IMGMODEL Explicitely removes equality constraints from model.`
`3`	`3`	`%`
`4`		`-% [Fi,hi,x,y] = imagemodel(F,h)`
	`4`	`+% [Fi,hi,x,y] = imgmodel(F,h)`
`5`	`5`	`%`
`6`	`6`	`% Input`
`7`	`7`	`% F : Constraint in form F(x)>0, Ax=b`