Skip to content

Commit

Permalink
Merge pull request #463 from pitmonticone/master
Browse files Browse the repository at this point in the history
Fix typos in example notebooks
  • Loading branch information
wvangeit committed Jun 14, 2023
2 parents c210d67 + 4213be1 commit e943444
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions examples/cma_strategy/cma.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
"source": [
"Second is the hybrid single/multi objective CMA strategy. It is tasked with both:\n",
"- minimizing the fitness computed as the sum of the scores \n",
"- maximizimg the hyper-volume of the Pareto front formed by the current population of models.\n",
"- maximizing the hyper-volume of the Pareto front formed by the current population of models.\n",
"\n",
"At each generation, all models in the population are ranked for both criteria, and a mixed rank is obtained following the formula:\n",
"\n",
Expand Down Expand Up @@ -324,12 +324,12 @@
"\n",
"From a theoretical point of view, the advantages of the CMA strategy seem strong:\n",
"- In IBEA, the creation of a new generation is performed through random mating and mutation. However, due to the lack of a learning rate, this leads to a lack of convergence in the latter stage of the optimisation as the models will jump around an optimal solution without being able to reach it. In CMA, the `sigma` parameter, which is the width of the distribution from which the models should be drawn, decreases once the optimisation finds a bassin in the fitness landscape, leading to smoother convergence.\n",
"- In IBEA, as the new generation only depends on the latest one, the knowledge contained in the previous generations is almost completely lost. In CMA, the covariance matrix continusly evolves, taking into account the results of each generation, leading to an accumulation of past knowledge about the shape of the local fitness landscape.\n",
"- In IBEA, as the new generation only depends on the latest one, the knowledge contained in the previous generations is almost completely lost. In CMA, the covariance matrix continuously evolves, taking into account the results of each generation, leading to an accumulation of past knowledge about the shape of the local fitness landscape.\n",
"- The ideal CMA population size, computed as int(4 + 3 * log(dimension_parameter_space)) is often one or two order of magnitude smaller than the population size needed by IBEA to reach the same results. This results in less compute per generation for the CMA strategy.\n",
"\n",
"However, CMA is not without drawbacks:\n",
"- It is frequent for the CMA strategy (especially the SO-CMA) to converge too quickly and thus get stuck in sub-optimal minima. Therefore, to achieve the exploration level displayed by the IBEA strategy, it might be needed to run several CMA optimisations in parallel and pool the results.\n",
"- Although the population size is much smaller when using the CMA strategy, a proper convergence might require many more generations than for the IBEA strategy, thus nulliying the advantage of the small generation in term of compute.\n",
"- Although the population size is much smaller when using the CMA strategy, a proper convergence might require many more generations than for the IBEA strategy, thus nullifying the advantage of the small generation in term of compute.\n",
"\n",
"Overall, CMA makes a more clever use of the information available, but IBEA is not to be neglected, especially if more compute power is available."
]
Expand Down
4 changes: 2 additions & 2 deletions examples/simplecell/simplecell-paperfig.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
"### Creating parameters\n",
"\n",
"Next we need to specify the parameters of the model. A parameter can be in two states: frozen and not-frozen. When a parameter is frozen it has an exact value, otherwise it only has some bounds but the exact value is not known yet.\n",
"Let's first a parameter that sets the capitance of the soma to a frozen value"
"Let's first a parameter that sets the capacitance of the soma to a frozen value"
]
},
{
Expand Down Expand Up @@ -1220,7 +1220,7 @@
"source": [
"### Defining eFeatures and objectives\n",
"\n",
"For every response we need to define a set of eFeatures we will use for the fitness calculation later. We have to combine features together into objectives that will be used by the optimalisation algorithm. In this case we will create one objective per feature:"
"For every response we need to define a set of eFeatures we will use for the fitness calculation later. We have to combine features together into objectives that will be used by the optimisation algorithm. In this case we will create one objective per feature:"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion examples/simplecell/simplecell_arbor.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@
"source": [
"### Defining eFeatures and objectives\n",
"\n",
"For every response we need to define a set of eFeatures we will use for the fitness calculation later. We have to combine features together into objectives that will be used by the optimalisation algorithm. In this case we will create one objective per feature:"
"For every response we need to define a set of eFeatures we will use for the fitness calculation later. We have to combine features together into objectives that will be used by the optimisation algorithm. In this case we will create one objective per feature:"
]
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"A cell evaluator can be easily created by specifing the desired electrical type (e-type).\n",
"A cell evaluator can be easily created by specifying the desired electrical type (e-type).\n",
"\n",
"A cell model is part of the cell evaluator and it is built by specifying a **morphology**, **mechanisms**, i.e. the ion channel models and the **bounds for the parameter values** (i.e. the densities of the ion channels)"
]
Expand Down

0 comments on commit e943444

Please sign in to comment.