CMSCOPE changed

3 files changed, 69 insertions, 0 deletions

diff --git a/modules/optimization/demos/datafit/datafit.dem.gateway.sce b/modules/optimization/demos/datafit/datafit.dem.gateway.sce
new file mode 100755
index 000000000..b9fc8dbb8
--- /dev/null
+++ b/modules/optimization/demos/datafit/datafit.dem.gateway.sce
@@ -0,0 +1,9 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2008 - INRIA
+// Copyright (C) 2010 - DIGITEO - Allan CORNET
+//
+// This file is released under the 3-clause BSD license. See COPYING-BSD.
+
+
+subdemolist = [_("Non linear data fitting"), "datafit.dem.sce"];
+subdemolist(:,2) = SCI + "/modules/optimization/demos/datafit/" + subdemolist(:,2);
diff --git a/modules/optimization/demos/datafit/datafit.dem.sce b/modules/optimization/demos/datafit/datafit.dem.sce
new file mode 100755
index 000000000..18f5969fc
--- /dev/null
+++ b/modules/optimization/demos/datafit/datafit.dem.sce
@@ -0,0 +1,9 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) ????-2008 - INRIA
+// Copyright (C) 2010 - DIGITEO - Allan CORNET
+//
+// This file is released under the 3-clause BSD license. See COPYING-BSD.
+
+exec("SCI/modules/optimization/demos/datafit/demo_datafit.sci");
+demo_datafit();
+clear demo_datafit;
diff --git a/modules/optimization/demos/datafit/demo_datafit.sci b/modules/optimization/demos/datafit/demo_datafit.sci
new file mode 100755
index 000000000..df7221836
--- /dev/null
+++ b/modules/optimization/demos/datafit/demo_datafit.sci
@@ -0,0 +1,51 @@
+//
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) ????-2008 - INRIA
+// Copyright (C) 2010 - DIGITEO - Allan CORNET
+//
+// This file is distributed under the same license as the Scilab package.
+//
+
+function demo_datafit()
+
+    function y = FF(x)
+        // parametric function model
+        y = a*(x-b)+c*x.*x;
+    endfunction
+
+    function e = G(p, z)
+        // datafit external computes the error
+        a = p(1),
+        b = p(2),
+        c = p(3),
+        y = z(1),
+        x = z(2),
+        e = y - FF(x)
+    endfunction
+
+    // create the experimental data
+    X = [];
+    Y = [];
+    a = 34;
+    b = 12;
+    c = 14;
+    for x=0:.1:3, Y=[Y,FF(x)+100*(rand()-.5)];X=[X,x];end
+    Z = [Y; X];
+    //show the data points
+    my_handle = scf(100001);
+    clf(my_handle, "reset");
+    demo_viewCode(SCI + "/modules/optimization/demos/datafit/demo_datafit.sci");
+    plot(X, Y, "+");
+    l=legend(_("Experimental data"),2);
+    sleep(500);
+    // solve the non linear data fitting
+    [p,err] = datafit(G,Z,[3;5;10])
+    // show the fitting curve
+    drawlater()
+    plot(X,FF(X), "r");
+    delete(l);
+    l = legend([_("Experimental data"); _("Fitting function")],2);
+    drawnow();
+
+endfunction
+