Skip to content

fix x0 and restart crit #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacobdenobel merged 1 commit into from
Apr 17, 2025
Merged

fix x0 and restart crit #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modcma/c_maes/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
Population,
Parameters,
ModularCMAES,
center,
es
)

Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
with open("README.md", "r", encoding="Latin-1") as fh:
long_description = fh.read()

__version__ = "1.0.12"
__version__ = "1.0.13"

ext = Pybind11Extension(
"modcma.c_maes.cmaescpp",
Expand Down
4 changes: 3 additions & 1 deletion src/center_placement.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ namespace center
{
void X0::operator()(parameters::Parameters &p)
{
p.adaptation->m = p.settings.x0.value_or(Vector::Zero(p.settings.dim));
const auto default_x0 = (p.settings.lb + p.settings.ub) / 2.0;

p.adaptation->m = p.settings.x0.value_or(default_x0);
}

void Uniform::operator()(parameters::Parameters &p)
Expand Down
27 changes: 13 additions & 14 deletions src/restart_criteria.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ namespace restart
met = time_since_restart > n_bin and recent_improvement == 0;
}

void MaxSigma::update(const parameters::Parameters& p)
void MaxSigma::update(const parameters::Parameters &p)
{
met = p.mutation->sigma > tolerance;
}

void MinSigma::update(const parameters::Parameters& p)
void MinSigma::update(const parameters::Parameters &p)
{
met = p.mutation->sigma < tolerance;
}
Expand Down Expand Up @@ -191,10 +191,9 @@ namespace restart

Criteria Criteria::get(const parameters::Modules modules)
{
vCriteria criteria {
std::make_shared<restart::UnableToAdapt>()
};

vCriteria criteria{
std::make_shared<restart::UnableToAdapt>()};

if (modules.restart_strategy >= parameters::RestartStrategyType::RESTART)
{
criteria.push_back(std::make_shared<restart::MinSigma>());
Expand All @@ -205,15 +204,15 @@ namespace restart
criteria.push_back(std::make_shared<restart::Stagnation>());
criteria.push_back(std::make_shared<restart::MinDSigma>());
criteria.push_back(std::make_shared<restart::MaxDSigma>());
}

if (modules.matrix_adaptation == parameters::MatrixAdaptationType::COVARIANCE ||
modules.matrix_adaptation == parameters::MatrixAdaptationType::SEPERABLE)
{
criteria.push_back(std::make_shared<restart::TolX>());
criteria.push_back(std::make_shared<restart::ConditionC>());
criteria.push_back(std::make_shared<restart::NoEffectAxis>());
criteria.push_back(std::make_shared<restart::NoEffectCoord>());
if (modules.matrix_adaptation == parameters::MatrixAdaptationType::COVARIANCE ||
modules.matrix_adaptation == parameters::MatrixAdaptationType::SEPERABLE)
{
criteria.push_back(std::make_shared<restart::TolX>());
criteria.push_back(std::make_shared<restart::ConditionC>());
criteria.push_back(std::make_shared<restart::NoEffectAxis>());
criteria.push_back(std::make_shared<restart::NoEffectCoord>());
}
}
return Criteria(criteria);
}
Expand Down