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

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

Revision: 5251
          http://octave.svn.sourceforge.net/octave/?rev=5251&view=rev
Author:   slackydeb
Date:     2008-08-21 10:59:18 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
fix a bug in __ga_initial_population__ when an InitialPopulation is specified, thanks to Thomas Weber (see http://lists.alioth.debian.org/pipermail/pkg-octave-devel/2008-August/004787.html)

Modified Paths:
--------------
    trunk/octave-forge/main/ga/DESCRIPTION
    trunk/octave-forge/main/ga/inst/__ga_initial_population__.m

Modified: trunk/octave-forge/main/ga/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/ga/DESCRIPTION	2008-08-20 14:51:38 UTC (rev 5250)
+++ trunk/octave-forge/main/ga/DESCRIPTION	2008-08-21 10:59:18 UTC (rev 5251)
@@ -1,6 +1,6 @@
 Name: ga
-Version: 0.9.2
-Date: 2008-08-16
+Version: 0.9.3
+Date: 2008-08-21
 Author: Luca Favatella <sla...@gm...>
 Maintainer: Luca Favatella <sla...@gm...>
 Title: Genetic Algorithm and Direct Search

Modified: trunk/octave-forge/main/ga/inst/__ga_initial_population__.m
===================================================================
--- trunk/octave-forge/main/ga/inst/__ga_initial_population__.m	2008-08-20 14:51:38 UTC (rev 5250)
+++ trunk/octave-forge/main/ga/inst/__ga_initial_population__.m	2008-08-21 10:59:18 UTC (rev 5251)
@@ -21,7 +21,7 @@
 ## @end deftypefn
 
 ## Author: Luca Favatella <sla...@gm...>
-## Version: 3.2.4
+## Version: 3.2.5
 
                                 #TODO consider PopulationSize as a
                                 #vector for multiple subpopolations
@@ -41,7 +41,7 @@
       CreatedPopulation(1:options.PopulationSize, 1:GenomeLength) = \
           options.CreationFcn (GenomeLength, FitnessFcn, options);
       Population(1:options.PopulationSize, 1:GenomeLength) = vertcat \
-          (options.InitialPopulation(1:nr, 1:GenomeLength),
+          (options.InitialPopulation(1:nrInitialPopulation, 1:GenomeLength),
            CreatedPopulation(1:(options.PopulationSize - nrInitialPopulation),
                              1:GenomeLength));
     elseif (nrInitialPopulation == options.PopulationSize)


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