Windows Included

16 files changed, 16 insertions, 16 deletions

diff --git a/tests/general_tests/fminunc/fminunc_f.sce b/tests/general_tests/fminunc/fminunc_f.sce
index 7fd0e2c..416f5cf 100644
--- a/tests/general_tests/fminunc/fminunc_f.sce
+++ b/tests/general_tests/fminunc/fminunc_f.sce
@@ -3,7 +3,7 @@
 
 fun = [];
 x0 = [1,2,3,4,5,6];
-options=list("MaxIter", [1500], "CpuTime", [500], "Gradient", "OFF", "Hessian", "OFF");
+options=list("MaxIter", [1500], "CpuTime", [500], "GradObj", "OFF", "Hessian", "OFF");
 
 //Error
 //fminbnd: Expected function for Objective (1st Parameter)
diff --git a/tests/general_tests/fminunc/fminunc_gradient1.sce b/tests/general_tests/fminunc/fminunc_gradient1.sce
index 214ff89..0da9b1c 100644
--- a/tests/general_tests/fminunc/fminunc_gradient1.sce
+++ b/tests/general_tests/fminunc/fminunc_gradient1.sce
@@ -5,7 +5,7 @@ function y = fun(x)
 	y = x(1)^2 + x(2)^2;
 endfunction
 x0 = [1,2];
-options=list("MaxIter", [1000], "CpuTime", [100], "Gradient", "OFn", "Hessian", "OFF");
+options=list("MaxIter", [1000], "CpuTime", [100], "GradObj", "OFn", "Hessian", "OFF");
 
 //Error
 //fminunc: Unrecognized String [OFn] entered for the option- Gradient.
diff --git a/tests/general_tests/fminunc/fminunc_gradient2.sce b/tests/general_tests/fminunc/fminunc_gradient2.sce
index 5c1c3d3..921e6ef 100644
--- a/tests/general_tests/fminunc/fminunc_gradient2.sce
+++ b/tests/general_tests/fminunc/fminunc_gradient2.sce
@@ -5,7 +5,7 @@ function y = fun(x)
 	y = x(1)^2 + x(2)^2;
 endfunction
 x0 = [1,2];
-options=list("MaxIter", [1000], "CpuTime", [100], "Gradient", "", "Hessian", "OFF");
+options=list("MaxIter", [1000], "CpuTime", [100], "GradObj", "", "Hessian", "OFF");
 
 //Error
 //fminunc: Unrecognized String [] entered for the option- Gradient.
diff --git a/tests/general_tests/fminunc/fminunc_gradient3.sce b/tests/general_tests/fminunc/fminunc_gradient3.sce
index f35f7f1..0cb85d7 100644
--- a/tests/general_tests/fminunc/fminunc_gradient3.sce
+++ b/tests/general_tests/fminunc/fminunc_gradient3.sce
@@ -6,7 +6,7 @@ function y = fun(x)
 endfunction
 x0 = [1,2];
 grad = [];
-options=list("MaxIter", [1000], "CpuTime", [100], "Gradient", grad, "Hessian", "OFF");
+options=list("MaxIter", [1000], "CpuTime", [100], "GradObj", grad, "Hessian", "OFF");
 
 //Error
 //fminunc: Expected function for Gradient of Objective
diff --git a/tests/general_tests/fminunc/fminunc_gradient4.sce b/tests/general_tests/fminunc/fminunc_gradient4.sce
index 3a6a716..b4ddc39 100644
--- a/tests/general_tests/fminunc/fminunc_gradient4.sce
+++ b/tests/general_tests/fminunc/fminunc_gradient4.sce
@@ -8,7 +8,7 @@ x0 = [1,2];
 function y = grad(x)
 	y=[2*x(1)];
 endfunction
-options=list("MaxIter", [1000], "CpuTime", [100], "Gradient", grad, "Hessian", "OFF");
+options=list("MaxIter", [1000], "CpuTime", [100], "GradObj", grad, "Hessian", "OFF");
 
 //Error
 //fminunc: Expected function for Hessian of Objective
diff --git a/tests/general_tests/fminunc/fminunc_hessian1.sce b/tests/general_tests/fminunc/fminunc_hessian1.sce
index a8ba79b..f4be9d4 100644
--- a/tests/general_tests/fminunc/fminunc_hessian1.sce
+++ b/tests/general_tests/fminunc/fminunc_hessian1.sce
@@ -5,7 +5,7 @@ function y = fun(x)
 	y = x(1)^2 + x(2)^2;
 endfunction
 x0 = [1,2];
-options=list("MaxIter", [1000], "CpuTime", [100], "Gradient", "OFF", "Hessian", "OFn");
+options=list("MaxIter", [1000], "CpuTime", [100], "GradObj", "OFF", "Hessian", "OFn");
 
 //Error
 //fminunc: Unrecognized String [OFn] entered for the option- Hessian.
diff --git a/tests/general_tests/fminunc/fminunc_hessian2.sce b/tests/general_tests/fminunc/fminunc_hessian2.sce
index 99fd6c1..f2c9335 100644
--- a/tests/general_tests/fminunc/fminunc_hessian2.sce
+++ b/tests/general_tests/fminunc/fminunc_hessian2.sce
@@ -5,7 +5,7 @@ function y = fun(x)
 	y = x(1)^2 + x(2)^2;
 endfunction
 x0 = [1,2];
-options=list("MaxIter", [1000], "CpuTime", [100], "Gradient", "OFf", "Hessian", "");
+options=list("MaxIter", [1000], "CpuTime", [100], "GradObj", "OFf", "Hessian", "");
 
 //Error
 //fminunc: Unrecognized String [] entered for the option- Hessian.
diff --git a/tests/general_tests/fminunc/fminunc_hessian4.sce b/tests/general_tests/fminunc/fminunc_hessian4.sce
index 47ce1c4..60c3177 100644
--- a/tests/general_tests/fminunc/fminunc_hessian4.sce
+++ b/tests/general_tests/fminunc/fminunc_hessian4.sce
@@ -8,7 +8,7 @@ x0 = [1,2];
 function y = hess(x)
 	y=[2,0];
 endfunction
-options=list("MaxIter", [1000], "CpuTime", [100], "Gradient", "OFF", "Hessian", hess);
+options=list("MaxIter", [1000], "CpuTime", [100], "GradObj", "OFF", "Hessian", hess);
 
 //Error
 //fminunc: Wrong Input for Objective Hessian function(3rd Parameter)---->Symmetric Matrix function of size [2 X 2] is Expected 
diff --git a/tests/general_tests/fminunc/fminunc_logical1.sce b/tests/general_tests/fminunc/fminunc_logical1.sce
index 54c4d7f..4621f81 100644
--- a/tests/general_tests/fminunc/fminunc_logical1.sce
+++ b/tests/general_tests/fminunc/fminunc_logical1.sce
@@ -5,7 +5,7 @@ function y = fun(x)
 	y = -(x(1)^2 + x(2)^2);
 endfunction
 x0 = [1,2];
-options=list("MaxIter", [1500], "CpuTime", [500], "Gradient", "OFF", "Hessian", "OFF");
+options=list("MaxIter", [1500], "CpuTime", [500], "GradObj", "OFF", "Hessian", "OFF");
 
 //Output
 //
diff --git a/tests/general_tests/fminunc/fminunc_logical2.sce b/tests/general_tests/fminunc/fminunc_logical2.sce
index 27d6cdd..c6e17c3 100644
--- a/tests/general_tests/fminunc/fminunc_logical2.sce
+++ b/tests/general_tests/fminunc/fminunc_logical2.sce
@@ -5,7 +5,7 @@ function y = fun(x)
 	y = log(x);
 endfunction
 x0 = [1];
-options=list("MaxIter", [1500], "CpuTime", [500], "Gradient", "OFF", "Hessian", "OFF");
+options=list("MaxIter", [1500], "CpuTime", [500], "GradObj", "OFF", "Hessian", "OFF");
 
 //Output
 //
diff --git a/tests/general_tests/fminunc/fminunc_logical3.sce b/tests/general_tests/fminunc/fminunc_logical3.sce
index 15ea3ad..2d746c7 100644
--- a/tests/general_tests/fminunc/fminunc_logical3.sce
+++ b/tests/general_tests/fminunc/fminunc_logical3.sce
@@ -5,7 +5,7 @@ function y = fun(x)
 	y = (x(1)-x(2))^2 + x(1);
 endfunction
 x0 = [1,2];
-options=list("MaxIter", [1000], "CpuTime", [500], "Gradient", "OFF", "Hessian", "OFF");
+options=list("MaxIter", [1000], "CpuTime", [500], "GradObj", "OFF", "Hessian", "OFF");
 
 //Output
 //
diff --git a/tests/general_tests/fminunc/fminunc_logical4.sce b/tests/general_tests/fminunc/fminunc_logical4.sce
index 60d75c5..b031c09 100644
--- a/tests/general_tests/fminunc/fminunc_logical4.sce
+++ b/tests/general_tests/fminunc/fminunc_logical4.sce
@@ -5,7 +5,7 @@ function y = fun(x)
 	y = (x(1)-x(2))^2 + x(1);
 endfunction
 x0 = [1,2];
-options=list("MaxIter", [1000], "CpuTime", [1.5], "Gradient", "OFF", "Hessian", "OFF");
+options=list("MaxIter", [1000], "CpuTime", [1.5], "GradObj", "OFF", "Hessian", "OFF");
 
 //Output
 //
diff --git a/tests/general_tests/fminunc/fminunc_options1.sce b/tests/general_tests/fminunc/fminunc_options1.sce
index eb939d5..a9cecf0 100644
--- a/tests/general_tests/fminunc/fminunc_options1.sce
+++ b/tests/general_tests/fminunc/fminunc_options1.sce
@@ -5,7 +5,7 @@ function y = fun(x)
 	y = x(1)^2 + x(2)^2;
 endfunction
 x0 = [1,2];
-options=list("MaxIter", "", "CpuTime", [500], "Gradient", "OFF", "Hessian", "OFF");
+options=list("MaxIter", "", "CpuTime", [500], "GradObj", "OFF", "Hessian", "OFF");
 
 //Error
 //fminunc: Value for Maximum Iteration should be a Constant
diff --git a/tests/general_tests/fminunc/fminunc_options2.sce b/tests/general_tests/fminunc/fminunc_options2.sce
index 1cf09ef..d5aa22b 100644
--- a/tests/general_tests/fminunc/fminunc_options2.sce
+++ b/tests/general_tests/fminunc/fminunc_options2.sce
@@ -5,7 +5,7 @@ function y = fun(x)
 	y = x(1)^2 + x(2)^2;
 endfunction
 x0 = [1,2];
-options=list("MaxIter", [1000], "CpuTime", , "Gradient", "OFF", "Hessian", "OFF");
+options=list("MaxIter", [1000], "CpuTime", , "GradObj", "OFF", "Hessian", "OFF");
 
 //Error
 //fminunc: Value for Maximum Cpu-time should be a Constant
diff --git a/tests/general_tests/fminunc/fminunc_x0a.sce b/tests/general_tests/fminunc/fminunc_x0a.sce
index e71b455..ae06be9 100644
--- a/tests/general_tests/fminunc/fminunc_x0a.sce
+++ b/tests/general_tests/fminunc/fminunc_x0a.sce
@@ -5,7 +5,7 @@ function y = fun(x)
 	y = x(1)^2 + x(2)^2;
 endfunction
 x0 = [];
-options=list("MaxIter", [1500], "CpuTime", [500], "Gradient", "OFF", "Hessian", "OFF");
+options=list("MaxIter", [1500], "CpuTime", [500], "GradObj", "OFF", "Hessian", "OFF");
 
 //Error
 //fminunc: Expected Row Vector or Column Vector for x0 (Initial Value) 
diff --git a/tests/general_tests/fminunc/fminunc_x0b.sce b/tests/general_tests/fminunc/fminunc_x0b.sce
index a08b458..76ce489 100644
--- a/tests/general_tests/fminunc/fminunc_x0b.sce
+++ b/tests/general_tests/fminunc/fminunc_x0b.sce
@@ -5,7 +5,7 @@ function y = fun(x)
 	y = x(1)^2 + x(2)^2;
 endfunction
 x0 = [1];
-options=list("MaxIter", [1500], "CpuTime", [500], "Gradient", "OFF", "Hessian", "OFF");
+options=list("MaxIter", [1500], "CpuTime", [500], "GradObj", "OFF", "Hessian", "OFF");
 
 //Error
 //fminunc: Objective function and x0 did not match