summaryrefslogtreecommitdiffstats
path: root/scilab/modules/genetic_algorithms
diff options
context:
space:
mode:
authorYann Collette <yann.collette@scilab.org>2009-11-23 14:34:29 +0100
committerYann Collette <yann.collette@scilab.org>2009-11-23 14:34:29 +0100
commit01226fec2dc471a7a18871dee60552fd051beb63 (patch)
tree87bc9d62e19cbe1f043a6fc4e52ae42563c40721 /scilab/modules/genetic_algorithms
parent703acd7fa2583c2b482201b6f29e90e750342fef (diff)
parentf5428916a2994c59eaed9b077faf499bbd22319c (diff)
downloadscilab-01226fec2dc471a7a18871dee60552fd051beb63.zip
scilab-01226fec2dc471a7a18871dee60552fd051beb63.tar.gz
Merge remote branch 'origin/5.2'
Diffstat (limited to 'scilab/modules/genetic_algorithms')
-rwxr-xr-xscilab/modules/genetic_algorithms/demos/GAIsing2ddemo.sce2
-rwxr-xr-xscilab/modules/genetic_algorithms/demos/GAdemo.sce4
-rwxr-xr-xscilab/modules/genetic_algorithms/demos/MOGAdemo.sce2
-rwxr-xr-xscilab/modules/genetic_algorithms/demos/NSGA2demo.sce2
-rwxr-xr-xscilab/modules/genetic_algorithms/demos/NSGAdemo.sce2
5 files changed, 12 insertions, 0 deletions
diff --git a/scilab/modules/genetic_algorithms/demos/GAIsing2ddemo.sce b/scilab/modules/genetic_algorithms/demos/GAIsing2ddemo.sce
index b0e40f2..26c2fe2 100755
--- a/scilab/modules/genetic_algorithms/demos/GAIsing2ddemo.sce
+++ b/scilab/modules/genetic_algorithms/demos/GAIsing2ddemo.sce
@@ -59,6 +59,8 @@ ga_params = add_param(ga_params,'pressure',pressure);
59// Genetic Algorithm // 59// Genetic Algorithm //
60/////////////////////// 60///////////////////////
61 61
62printf(gettext("%s: optimization starting, please wait ...\n"),"GAIsing");
63
62[pop_opt, fobj_pop_opt, pop_init, fobj_pop_init] = optim_ga(f, PopSize, NbGen, Proba_mut, Proba_cross, Log, ga_params); 64[pop_opt, fobj_pop_opt, pop_init, fobj_pop_init] = optim_ga(f, PopSize, NbGen, Proba_mut, Proba_cross, Log, ga_params);
63 65
64printf('Genetic Algorithm: %d points from pop_opt\n', nb_disp); 66printf('Genetic Algorithm: %d points from pop_opt\n', nb_disp);
diff --git a/scilab/modules/genetic_algorithms/demos/GAdemo.sce b/scilab/modules/genetic_algorithms/demos/GAdemo.sce
index 0db6f66..12d1ba3 100755
--- a/scilab/modules/genetic_algorithms/demos/GAdemo.sce
+++ b/scilab/modules/genetic_algorithms/demos/GAdemo.sce
@@ -78,6 +78,8 @@ end
78// Genetic Algorithm // 78// Genetic Algorithm //
79/////////////////////// 79///////////////////////
80 80
81printf(gettext("%s: optimization starting, please wait ...\n"),"GA");
82
81[pop_opt, fobj_pop_opt, pop_init, fobj_pop_init] = optim_ga(f, PopSize, NbGen, Proba_mut, Proba_cross, Log, ga_params); 83[pop_opt, fobj_pop_opt, pop_init, fobj_pop_init] = optim_ga(f, PopSize, NbGen, Proba_mut, Proba_cross, Log, ga_params);
82 84
83if (size(pop_opt(1)',2)==2) then 85if (size(pop_opt(1)',2)==2) then
@@ -120,6 +122,8 @@ ga_params = set_param(ga_params,'codage_func',coding_ga_binary);
120ga_params = add_param(ga_params,'multi_cross',%T); 122ga_params = add_param(ga_params,'multi_cross',%T);
121ga_params = add_param(ga_params,'multi_cross_nb',3); 123ga_params = add_param(ga_params,'multi_cross_nb',3);
122 124
125printf(gettext("%s: optimization starting, please wait ...\n"),"GA");
126
123[pop_opt, fobj_pop_opt, pop_init, fobj_pop_init] = optim_ga(f, PopSize, NbGen, Proba_mut, Proba_cross, Log, ga_params); 127[pop_opt, fobj_pop_opt, pop_init, fobj_pop_init] = optim_ga(f, PopSize, NbGen, Proba_mut, Proba_cross, Log, ga_params);
124 128
125if (size(pop_opt(1)',2)==2) then 129if (size(pop_opt(1)',2)==2) then
diff --git a/scilab/modules/genetic_algorithms/demos/MOGAdemo.sce b/scilab/modules/genetic_algorithms/demos/MOGAdemo.sce
index ec3756a..ed5dc60 100755
--- a/scilab/modules/genetic_algorithms/demos/MOGAdemo.sce
+++ b/scilab/modules/genetic_algorithms/demos/MOGAdemo.sce
@@ -80,6 +80,8 @@ deff('y=fobjs(x)','y = ' + funcname + '(x);');
80// MOGA Algorithm // 80// MOGA Algorithm //
81//////////////////// 81////////////////////
82 82
83printf(gettext("%s: optimization starting, please wait ...\n"),"MOGA");
84
83[pop_opt, fobj_pop_opt, pop_init, fobj_pop_init] = optim_moga(fobjs, PopSize, NbGen, Proba_mut, Proba_cross, Log, ga_params); 85[pop_opt, fobj_pop_opt, pop_init, fobj_pop_init] = optim_moga(fobjs, PopSize, NbGen, Proba_mut, Proba_cross, Log, ga_params);
84 86
85[f_pareto,pop_pareto] = pareto_filter(fobj_pop_opt,pop_opt); 87[f_pareto,pop_pareto] = pareto_filter(fobj_pop_opt,pop_opt);
diff --git a/scilab/modules/genetic_algorithms/demos/NSGA2demo.sce b/scilab/modules/genetic_algorithms/demos/NSGA2demo.sce
index 93ac0f3..996f4cf 100755
--- a/scilab/modules/genetic_algorithms/demos/NSGA2demo.sce
+++ b/scilab/modules/genetic_algorithms/demos/NSGA2demo.sce
@@ -78,6 +78,8 @@ deff('y=fobjs(x)','y = ' + funcname + '(x);');
78// NSGA2 Algorithm // 78// NSGA2 Algorithm //
79///////////////////// 79/////////////////////
80 80
81printf(gettext("%s: optimization starting, please wait ...\n"),"NSGA2");
82
81[pop_opt, fobj_pop_opt, pop_init, fobj_pop_init] = optim_nsga2(fobjs, PopSize, NbGen, Proba_mut, Proba_cross, Log, ga_params); 83[pop_opt, fobj_pop_opt, pop_init, fobj_pop_init] = optim_nsga2(fobjs, PopSize, NbGen, Proba_mut, Proba_cross, Log, ga_params);
82 84
83[f_pareto,pop_pareto] = pareto_filter(fobj_pop_opt,pop_opt); 85[f_pareto,pop_pareto] = pareto_filter(fobj_pop_opt,pop_opt);
diff --git a/scilab/modules/genetic_algorithms/demos/NSGAdemo.sce b/scilab/modules/genetic_algorithms/demos/NSGAdemo.sce
index 4852f49..d6bfc46 100755
--- a/scilab/modules/genetic_algorithms/demos/NSGAdemo.sce
+++ b/scilab/modules/genetic_algorithms/demos/NSGAdemo.sce
@@ -82,6 +82,8 @@ deff('y=fobjs(x)','y = ' + funcname + '(x);');
82// NSGA Algorithm // 82// NSGA Algorithm //
83//////////////////// 83////////////////////
84 84
85printf(gettext("%s: optimization starting, please wait ...\n"),"NSGA");
86
85[pop_opt, fobj_pop_opt, pop_init, fobj_pop_init] = optim_nsga(fobjs, PopSize, NbGen, Proba_mut, Proba_cross, Log, ga_params, Sigma, Pow); 87[pop_opt, fobj_pop_opt, pop_init, fobj_pop_init] = optim_nsga(fobjs, PopSize, NbGen, Proba_mut, Proba_cross, Log, ga_params, Sigma, Pow);
86 88
87[f_pareto,pop_pareto] = pareto_filter(fobj_pop_opt,pop_opt); 89[f_pareto,pop_pareto] = pareto_filter(fobj_pop_opt,pop_opt);