add a hierarchy in the optimization demos
Yann Collette [Wed, 10 Mar 2010 14:30:59 +0000 (15:30 +0100)]
scilab/modules/genetic_algorithms/demos/genetic_algorithms.dem.gateway.sce
scilab/modules/optimization/demos/datafit/datafit.dem.gateway.sce [new file with mode: 0644]
scilab/modules/optimization/demos/neldermead/neldermead.dem.gateway.sce [new file with mode: 0644]
scilab/modules/optimization/demos/optim/optim.dem.gateway.sce [new file with mode: 0644]
scilab/modules/optimization/demos/optimization.dem.gateway.sce
scilab/modules/simulated_annealing/demos/simulated_annealing.dem.gateway.sce

index 2bb8fc7..c8a1476 100644 (file)
@@ -1,14 +1,17 @@
 //
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 // Copyright (C) 2009 - INRIA
+// Copyright (C) 2010 - DIGITEO - Yann COLLETTE
 //
 // This file is distributed under the same license as the Scilab package.
 //
 
 demopath = get_absolute_file_path("genetic_algorithms.dem.gateway.sce");
+
 subdemolist = ["Genetic algorithms",                   "GAdemo.sce"; ...
               "Genetic algorithms and Ising problem", "GAIsing2ddemo.sce"; ...
               "MultiObjective Genetic Algorithm",     "MOGAdemo.sce"; ...
               "Niched Sharing Genetic Algorithm",     "NSGAdemo.sce"; ...
               "Niched Sharing Genetic Algorithm II",  "NSGA2demo.sce" ];
+
 subdemolist(:,2) = demopath + subdemolist(:,2)
diff --git a/scilab/modules/optimization/demos/datafit/datafit.dem.gateway.sce b/scilab/modules/optimization/demos/datafit/datafit.dem.gateway.sce
new file mode 100644 (file)
index 0000000..87e62f3
--- /dev/null
@@ -0,0 +1,14 @@
+//
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2008 - INRIA
+//
+// This file is distributed under the same license as the Scilab package.
+//
+
+demopath = get_absolute_file_path("datafit.dem.gateway.sce");
+
+subdemolist = ["Non linear data fitting", "datafit.dem.sce"];
+
+subdemolist(:,2) = demopath + subdemolist(:,2)
+
+
diff --git a/scilab/modules/optimization/demos/neldermead/neldermead.dem.gateway.sce b/scilab/modules/optimization/demos/neldermead/neldermead.dem.gateway.sce
new file mode 100644 (file)
index 0000000..af6dbb0
--- /dev/null
@@ -0,0 +1,35 @@
+//
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2008 - INRIA
+// Copyright (C) 2010 - DIGITEO - Yann COLLETTE
+//
+// This file is distributed under the same license as the Scilab package.
+//
+
+demopath = get_absolute_file_path("neldermead.dem.gateway.sce");
+
+subdemolist = ["fminsearch - Rosenbrock",          "fminsearch_rosenbrock.sce"; ...
+              "fminsearch - tolx",                "fminsearch_tolx.sce"; ...
+              "fminsearch - Output Function",     "fminsearch_outputfunction.sce"; ...
+              "fminsearch - Option Display",      "fminsearch_display.sce"; ...
+              "fminsearch - Plot Func Count",     "fminsearch_optimplotfunccount.sce"; ...
+              "fminsearch - Plot F",              "fminsearch_optimplotfval.sce"; ...
+              "fminsearch - Plot X",              "fminsearch_optimplotx.sce"; ...
+              "neldermead - Rosenbrock Variable", "neldermead_rosenbrock.sce"; ...
+              "neldermead - Output Command",      "neldermead_outputcmd.sce"; ...
+              "nmplot - Han #1",                  "nmplot_han1.sce"; ...
+              "nmplot - Han #2",                  "nmplot_han2.sce"; ...
+              "nmplot - McKinnon #1",             "nmplot_mckinnon.sce"; ...
+              "nmplot - McKinnon #2",             "nmplot_mckinnon2.sce"; ...
+              "nmplot - Quadratic Fixed #1",      "nmplot_quadratic.fixed.sce"; ...
+              "nmplot - Quadratic Fixed #2",      "nmplot_quadratic.fixed2.sce"; ...
+              "nmplot - Rosenbrock Fixed",        "nmplot_rosenbrock.fixed.sce"; ...
+              "nmplot - Rosenbrock Variable",     "nmplot_rosenbrock.sce"; ...
+              "neldermead - Box A",               "neldermead_boxproblemA.sce"; ...
+              "neldermead - Box B",               "neldermead_boxproblemB.sce"; ...
+              "neldermead - Box Bounds",          "neldermead_boxbounds.sce"; ...
+              "neldermead - Box Post",            "neldermead_boxpost.sce"];
+
+subdemolist(:,2) = demopath + subdemolist(:,2)
+
+
diff --git a/scilab/modules/optimization/demos/optim/optim.dem.gateway.sce b/scilab/modules/optimization/demos/optim/optim.dem.gateway.sce
new file mode 100644 (file)
index 0000000..a744e65
--- /dev/null
@@ -0,0 +1,17 @@
+//
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2008 - INRIA
+//
+// This file is distributed under the same license as the Scilab package.
+//
+
+demopath = get_absolute_file_path("optim.dem.gateway.sce");
+
+subdemolist = ["Rosenbrock", "optim_rosenbrock.sce"; ...
+              "Output",     "optim_output.sce"; ...
+              "Plot",       "optim_plot.sce"; ...
+              "Derivative", "optim_withderivative.sce"];
+
+subdemolist(:,2) = demopath + subdemolist(:,2)
+
+
index 0e91302..9d3a520 100644 (file)
@@ -6,50 +6,18 @@
 //
 
 demopath = get_absolute_file_path("optimization.dem.gateway.sce");
-subdemolist = [
-"Non linear data fitting",               "datafit/datafit.dem.sce"; ...
-"optim/Rosenbrock",                      "optim/optim_rosenbrock.sce"; ...
-"optim/Output",                          "optim/optim_output.sce"; ...
-"optim/Plot",                            "optim/optim_plot.sce"; ...
-"optim/Derivative",                      "optim/optim_withderivative.sce"; ...
-"fminsearch/Rosenbrock",                 "neldermead/fminsearch_rosenbrock.sce"; ...
-"fminsearch/tolx",                       "neldermead/fminsearch_tolx.sce"; ...
-"fminsearch/Output Function",            "neldermead/fminsearch_outputfunction.sce"; ...
-"fminsearch/Option Display",             "neldermead/fminsearch_display.sce"; ...
-"fminsearch/Plot Func Count",            "neldermead/fminsearch_optimplotfunccount.sce"; ...
-"fminsearch/Plot F",                     "neldermead/fminsearch_optimplotfval.sce"; ...
-"fminsearch/Plot X",                     "neldermead/fminsearch_optimplotx.sce"; ...
-"neldermead/Rosenbrock Variable",        "neldermead/neldermead_rosenbrock.sce"; ...
-"neldermead/Output Command",             "neldermead/neldermead_outputcmd.sce"; ...
-"nmplot/Han #1",                         "neldermead/nmplot_han1.sce"; ...
-"nmplot/Han #2",                         "neldermead/nmplot_han2.sce"; ...
-"nmplot/McKinnon #1",                    "neldermead/nmplot_mckinnon.sce"; ...
-"nmplot/McKinnon #2",                    "neldermead/nmplot_mckinnon2.sce"; ...
-"nmplot/Quadratic Fixed #1",             "neldermead/nmplot_quadratic.fixed.sce"; ...
-"nmplot/Quadratic Fixed #2",             "neldermead/nmplot_quadratic.fixed2.sce"; ...
-"nmplot/Rosenbrock Fixed",               "neldermead/nmplot_rosenbrock.fixed.sce"; ...
-"nmplot/Rosenbrock Variable",            "neldermead/nmplot_rosenbrock.sce"; ...
-"neldermead/Box A",                      "neldermead/neldermead_boxproblemA.sce"; ...
-"neldermead/Box B",                      "neldermead/neldermead_boxproblemB.sce"; ...
-"neldermead/Box Bounds",                 "neldermead/neldermead_boxbounds.sce"; ...
-"neldermead/Box Post",                   "neldermead/neldermead_boxpost.sce" ...
-];
+subdemolist = ["Non linear data fitting", "datafit/datafit.dem.gateway.sce"; ...
+              "Optimisation",            "optim/optim.dem.gateway.sce"; ...
+              "fminsearch",              "neldermead/neldermead.dem.gateway.sce"];
 
 if with_module('genetic_algorithms') then
   subdemolist = [subdemolist; ...
-                 "Genetic algorithms",                    "../../genetic_algorithms/demos/GAdemo.sce"; ...
-                 "Genetic algorithms and Ising problem",  "../../genetic_algorithms/demos/GAIsing2ddemo.sce"; ...
-                 "MultiObjective Genetic Algorithm",      "../../genetic_algorithms/demos/MOGAdemo.sce"; ...
-                 "Niched Sharing Genetic Algorithm",      "../../genetic_algorithms/demos/NSGAdemo.sce"; ...
-                 "Niched Sharing Genetic Algorithm II",   "../../genetic_algorithms/demos/NSGA2demo.sce"];
+                 "Genetic algorithms", "../../genetic_algorithms/demos/genetic_algorithms.dem.gateway.sce"];
 end 
 
 if with_module('simulated_annealing') then
   subdemolist = [subdemolist; ...
-                 "Simulated Annealing",                   "../../simulated_annealing/demos/SAdemo.sce"; ...
-                 "Simulated Annealing and Ising problem", "../../simulated_annealing/demos/SAIsing2ddemo.sce"];
+                 "Simulated Annealing", "../../simulated_annealing/demos/simulated_annealing.dem.gateway.sce"];
 end
 
 subdemolist(:,2) = demopath + subdemolist(:,2)
-
-
index bbdeb0d..8b87f92 100644 (file)
@@ -1,11 +1,14 @@
 //
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 // Copyright (C) 2009 - INRIA
+// Copyright (C) 2010 - DIGITEO - Yann COLLETTE
 //
 // This file is distributed under the same license as the Scilab package.
 //
 
 demopath = get_absolute_file_path("simulated_annealing.dem.gateway.sce");
+
 subdemolist = ["Simulated Annealing",                   "SAdemo.sce"; ...
               "Simulated Annealing and Ising problem", "SAIsing2ddemo.sce"];
+
 subdemolist(:,2) = demopath + subdemolist(:,2)