[Octave-cvsupdate] SF.net SVN: octave:[5223] trunk/octave-forge/main/ga

[<sla...@us...>]

Revision: 5223
          http://octave.svn.sourceforge.net/octave/?rev=5223&view=rev
Author:   slackydeb
Date:     2008-08-05 21:14:13 +0000 (Tue, 05 Aug 2008)

Log Message:
-----------
fix interface in MutationFcn call and function

Modified Paths:
--------------
    trunk/octave-forge/main/ga/DESCRIPTION
    trunk/octave-forge/main/ga/inst/__ga_problem__.m
    trunk/octave-forge/main/ga/inst/crossoverscattered.m
    trunk/octave-forge/main/ga/inst/crossoversinglepoint.m
    trunk/octave-forge/main/ga/inst/mutationsinglepoint.m

Modified: trunk/octave-forge/main/ga/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/ga/DESCRIPTION	2008-08-05 20:48:56 UTC (rev 5222)
+++ trunk/octave-forge/main/ga/DESCRIPTION	2008-08-05 21:14:13 UTC (rev 5223)
@@ -1,5 +1,5 @@
 Name: ga
-Version: 0.4.7
+Version: 0.4.8
 Date: 2008-08-05
 Author: Luca Favatella <sla...@gm...>
 Maintainer: Luca Favatella <sla...@gm...>

Modified: trunk/octave-forge/main/ga/inst/__ga_problem__.m
===================================================================
--- trunk/octave-forge/main/ga/inst/__ga_problem__.m	2008-08-05 20:48:56 UTC (rev 5222)
+++ trunk/octave-forge/main/ga/inst/__ga_problem__.m	2008-08-05 21:14:13 UTC (rev 5223)
@@ -62,7 +62,15 @@
       else
         index_parent = problem.options.SelectionFcn (problem.fitnessfcn,
                                                      popolazione);
-        popolazione_futura(i, :) = problem.options.MutationFcn (popolazione(index_parent(1), :));
+        parent = popolazione(index_parent(1), :);
+        popolazione_futura(i, :) = \ #TODO parent -> parents
+            problem.options.MutationFcn (parent,
+                                         problem.options,
+                                         problem.nvars,
+                                         problem.fitnessfcn,
+                                         false, #TODO false -> state
+                                         false, #TODO false -> thisScore
+                                         popolazione);
       endif
     endfor
 

Modified: trunk/octave-forge/main/ga/inst/crossoverscattered.m
===================================================================
--- trunk/octave-forge/main/ga/inst/crossoverscattered.m	2008-08-05 20:48:56 UTC (rev 5222)
+++ trunk/octave-forge/main/ga/inst/crossoverscattered.m	2008-08-05 21:14:13 UTC (rev 5223)
@@ -17,18 +17,19 @@
 ## 02110-1301, USA.
 
 ## -*- texinfo -*-
-## @deftypefn{Function File} {@var{xoverKids} =} crossoverscattered (@var{parents}, @var{parents}, @var{options}, @var{nvars}, @var{FitnessFcn}, @var{unused}, @var{thisPopulation})
+## @deftypefn{Function File} {@var{xoverKids} =} crossoverscattered (@var{parents}, @var{options}, @var{nvars}, @var{FitnessFcn}, @var{unused}, @var{thisPopulation})
 ## Combine two individuals, or parents, to form a crossover child.
 ##
 ## @seealso{ga, gaoptimset}
 ## @end deftypefn
 
 ## Author: Luca Favatella <sla...@gm...>
-## Version: 4.0
+## Version: 4.0.2
 
 function xoverKids = \
       crossoverscattered (parents,
-                          options, nvars, FitnessFcn, unused, thisPopulation)
+                          options, nvars, FitnessFcn, unused,
+                          thisPopulation)
   concatenated_parents = [(__ga_doubles2concatenated_bitstring__ \
                            (parents(1, :))); \
                           (__ga_doubles2concatenated_bitstring__ \

Modified: trunk/octave-forge/main/ga/inst/crossoversinglepoint.m
===================================================================
--- trunk/octave-forge/main/ga/inst/crossoversinglepoint.m	2008-08-05 20:48:56 UTC (rev 5222)
+++ trunk/octave-forge/main/ga/inst/crossoversinglepoint.m	2008-08-05 21:14:13 UTC (rev 5223)
@@ -17,18 +17,19 @@
 ## 02110-1301, USA.
 
 ## -*- texinfo -*-
-## @deftypefn{Function File} {@var{xoverKids} =} crossoversinglepoint (@var{parents}, @var{parents}, @var{options}, @var{nvars}, @var{FitnessFcn}, @var{unused}, @var{thisPopulation})
+## @deftypefn{Function File} {@var{xoverKids} =} crossoversinglepoint (@var{parents}, @var{options}, @var{nvars}, @var{FitnessFcn}, @var{unused}, @var{thisPopulation})
 ## Combine two individuals, or parents, to form a crossover child.
 ##
 ## @seealso{ga, gaoptimset}
 ## @end deftypefn
 
 ## Author: Luca Favatella <sla...@gm...>
-## Version: 4.0
+## Version: 4.0.2
 
 function xoverKids = \
       crossoversinglepoint (parents,
-                            options, nvars, FitnessFcn, unused, thisPopulation)
+                            options, nvars, FitnessFcn, unused,
+                            thisPopulation)
 
   %% constants
   N_BIT_DOUBLE = 64;

Modified: trunk/octave-forge/main/ga/inst/mutationsinglepoint.m
===================================================================
--- trunk/octave-forge/main/ga/inst/mutationsinglepoint.m	2008-08-05 20:48:56 UTC (rev 5222)
+++ trunk/octave-forge/main/ga/inst/mutationsinglepoint.m	2008-08-05 21:14:13 UTC (rev 5223)
@@ -17,16 +17,20 @@
 ## 02110-1301, USA.
 
 ## -*- texinfo -*-
-## @deftypefn{Function File} {@var{mutationChildren} =} mutationsinglepoint (@var{parent})
+## @deftypefn{Function File} {@var{mutationChildren} =} mutationsinglepoint (@var{parents}, @var{options}, @var{nvars}, @var{FitnessFcn}, @var{state}, @var{thisScore}, @var{thisPopulation})
 ## Single point mutation.
 ##
 ## @seealso{ga, gaoptimset}
 ## @end deftypefn
 
 ## Author: Luca Favatella <sla...@gm...>
-## Version: 3.2
+## Version: 4.0.1
 
-function mutationChildren = mutationsinglepoint (parent)
+function mutationChildren = \
+      mutationsinglepoint (parents,
+                           options, nvars, FitnessFcn, state,
+                           thisScore, thisPopulation)
+  parent = parents;
 
   %% constants
   N_BIT_DOUBLE = 64;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.