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

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

Revision: 5222
          http://octave.svn.sourceforge.net/octave/?rev=5222&view=rev
Author:   slackydeb
Date:     2008-08-05 20:48:56 +0000 (Tue, 05 Aug 2008)

Log Message:
-----------
fix interface in Crossoverfcn calls and functions

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

Modified: trunk/octave-forge/main/ga/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/ga/DESCRIPTION	2008-08-05 19:03:27 UTC (rev 5221)
+++ trunk/octave-forge/main/ga/DESCRIPTION	2008-08-05 20:48:56 UTC (rev 5222)
@@ -1,5 +1,5 @@
 Name: ga
-Version: 0.4.6
+Version: 0.4.7
 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 19:03:27 UTC (rev 5221)
+++ trunk/octave-forge/main/ga/inst/__ga_problem__.m	2008-08-05 20:48:56 UTC (rev 5222)
@@ -17,7 +17,7 @@
 ## 02110-1301, USA.
 
 ## Author: Luca Favatella <sla...@gm...>
-## Version: 4.1.2
+## Version: 4.2
 
 function [x fval exitflag output population scores] = __ga_problem__ (problem)
   individui_migliori = [];
@@ -50,7 +50,13 @@
                                                       popolazione);
         parents = [popolazione(index_parents(1), :);
                    popolazione(index_parents(2), :)];
-        popolazione_futura(i, :) = problem.options.CrossoverFcn (parents);
+        popolazione_futura(i, :) = \
+            problem.options.CrossoverFcn (parents,
+                                          problem.options,
+                                          problem.nvars,
+                                          problem.fitnessfcn,
+                                          false, ## unused
+                                          popolazione);
 
       %% mutation
       else

Modified: trunk/octave-forge/main/ga/inst/crossoverscattered.m
===================================================================
--- trunk/octave-forge/main/ga/inst/crossoverscattered.m	2008-08-05 19:03:27 UTC (rev 5221)
+++ trunk/octave-forge/main/ga/inst/crossoverscattered.m	2008-08-05 20:48:56 UTC (rev 5222)
@@ -17,19 +17,18 @@
 ## 02110-1301, USA.
 
 ## -*- texinfo -*-
-## @deftypefn{Function File} {@var{xoverKids} =} crossoverscattered (@var{parents})
+## @deftypefn{Function File} {@var{xoverKids} =} crossoverscattered (@var{parents}, @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: 3.2
+## Version: 4.0
 
-                                % different signature from MATLAB
-                                % because of a problem of function
-                                % handle (retry if more spare time)
-function xoverKids = crossoverscattered (parents)
+function xoverKids = \
+      crossoverscattered (parents,
+                          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 19:03:27 UTC (rev 5221)
+++ trunk/octave-forge/main/ga/inst/crossoversinglepoint.m	2008-08-05 20:48:56 UTC (rev 5222)
@@ -17,19 +17,18 @@
 ## 02110-1301, USA.
 
 ## -*- texinfo -*-
-## @deftypefn{Function File} {@var{xoverKids} =} crossoversinglepoint (@var{parents})
+## @deftypefn{Function File} {@var{xoverKids} =} crossoversinglepoint (@var{parents}, @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: 3.2
+## Version: 4.0
 
-                                % different signature from MATLAB
-                                % because of a problem of function
-                                % handle (retry if more spare time)
-function xoverKids = crossoversinglepoint (parents)
+function xoverKids = \
+      crossoversinglepoint (parents,
+                            options, nvars, FitnessFcn, unused, thisPopulation)
 
   %% constants
   N_BIT_DOUBLE = 64;


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