call of inspect_population before resize!

sadit · Feb 26, 2021 · d235186 · d235186 · sadit · Feb 26, 2021
1 parent ba59f11
commit d235186
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,8 +7,7 @@ on:
       # Push events on main branch
       - main
     # Sequence of patterns matched against refs/tags
-    tags:        
-      - v*.*.*
+    tags: '*'
 
 jobs:
   test:

diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "SearchModels"
 uuid = "0e966ebe-b704-4a65-8279-db954bfe5da0"
 authors = ["Eric S. Tellez"]
-version = "0.1.4"
+version = "0.1.5"
 
 [deps]
 Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"

diff --git a/docs/src/example.md b/docs/src/example.md
@@ -9,9 +9,11 @@ This is a toy example that help us to select and fit a polynomial model for an i
 The approach of `SearchModels` consists on modeling our solution space defining a struct type and three related methods: `random_configuration`, `combine_configuration`, and `mutate_configuration`. We also may need to define `config_type` and `eltype`. In particular, `config_type` needs to be defined here to put the type as the polynomial's degree to be able to distinguish among different degrees. The `eltype` should be defined to use concrete types internally on several queues.
 
 ```@example Poly
-using SearchModels
+using SearchModels, Random
 import SearchModels: random_configuration, combine_configurations, mutate_configuration, config_type
 
+Random.seed!(0) # fixing seed
+
 struct PolyModelSpace <: AbstractSolutionSpace
     degree
 end

diff --git a/src/SearchModels.jl b/src/SearchModels.jl
@@ -142,8 +142,7 @@ function evaluate_queue(error_function::Function, evalqueue, population, config_
         end
     end
     ## verbose && println(stderr, "SearchModels> *** iteration $iter finished")
-
-    sort!(population, by=x->x.second)
+    population
 end
 
 """
@@ -229,11 +228,13 @@ function search_models(
         iter += 1
         empty!(config_and_errors)
         evaluate_queue(error_function, evalqueue, population, config_and_errors, parallel)
+        sort!(population, by=x->x.second)
+        inspect_population(space, population)
+
         if maxpopulation < length(population)
             resize!(population, maxpopulation)
         end
 
-        inspect_population(space, population)
         if iter >= maxiters
             verbose && println("SearchModels> reached maximum number of iterations $maxiters")
             return population