Skip to content
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

Jump to bottom

Remerge mainline changes #2

Open
wants to merge 50 commits into
base: master
Choose a base branch
from
Open

Remerge mainline changes #2

wants to merge 50 commits into from

Commits on Jan 9, 2018

  1. Populations can be pickled

    @peter-ch
    peter-ch committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    ecaebd4 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2018

  1. Being able to set Genome traits [not done yet]

    @peter-ch
    peter-ch committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    9192674 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2018

  1. Bugfixes

    @peter-ch
    peter-ch committed Feb 18, 2018
    Configuration menu
    Copy the full SHA
    9607553 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2018

  1. Conflicts

    @peter-ch
    peter-ch committed May 11, 2018
    Configuration menu
    Copy the full SHA
    08331c2 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2018

  1. Changed to use emplace_back() project wide

    @peter-ch
    peter-ch committed Aug 17, 2018
    Configuration menu
    Copy the full SHA
    9b02757 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2018

  1. Species now have internal changeable parameters, new parameter for th… 

    …e min distance when checking for genetic identity
    @peter-ch
    peter-ch committed Aug 19, 2018
    Configuration menu
    Copy the full SHA
    632d401 View commit details
    Browse the repository at this point in the history

  2. Some refactoring, new parameter [WIP]

    @peter-ch
    peter-ch committed Aug 19, 2018
    Configuration menu
    Copy the full SHA
    5dec58d View commit details
    Browse the repository at this point in the history

  3. Fixes, refactoring

    @peter-ch
    peter-ch committed Aug 19, 2018
    Configuration menu
    Copy the full SHA
    c4a000d View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2018

  1. Speciation allows arbitrary metrics (in Python), new ConstraintTrials… 

    … parameter
    @peter-ch
    peter-ch committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    19b4262 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2018

  1. bugfix

    @peter-ch
    peter-ch committed Sep 21, 2018
    Configuration menu
    Copy the full SHA
    8e09224 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2019

  1. A few bugfixes

    @peter-ch
    peter-ch committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    3154e9a View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2019

  1. various stuff related to GP

    @peter-ch
    peter-ch committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    6cc80c6 View commit details
    Browse the repository at this point in the history

  2. Speedups #1

    @peter-ch
    peter-ch committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    fe45990 View commit details
    Browse the repository at this point in the history

  3. Speedup #2

    @peter-ch
    peter-ch committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    b2e63b2 View commit details
    Browse the repository at this point in the history

  4. Speedup #2.5

    @peter-ch
    peter-ch committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    5623241 View commit details
    Browse the repository at this point in the history

  5. Speedup #2.6

    @peter-ch
    peter-ch committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    2e65ab0 View commit details
    Browse the repository at this point in the history

  6. New parameter in genome constructor and bugfixes

    @peter-ch
    peter-ch committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    6dad365 View commit details
    Browse the repository at this point in the history

  7. Tiny fixes and tests

    @peter-ch
    peter-ch committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    3a1445b View commit details
    Browse the repository at this point in the history

  8. Little change

    @peter-ch
    peter-ch committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    2584ce0 View commit details
    Browse the repository at this point in the history

  9. Trait mutations forced to be different

    @peter-ch
    peter-ch committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    1b0b6fd View commit details
    Browse the repository at this point in the history

  10. Bugfix WIP

    @peter-ch
    peter-ch committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    f1adf29 View commit details
    Browse the repository at this point in the history

  11. Crossover improvements

    @peter-ch
    peter-ch committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    7e4f5f7 View commit details
    Browse the repository at this point in the history

  12. Fixes.

    @peter-ch
    peter-ch committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    b774fec View commit details
    Browse the repository at this point in the history

  13. ...

    @peter-ch
    peter-ch committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    e2ef4f0 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'dev' into full_lineage_report

    @peter-ch
    peter-ch committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    7674061 View commit details
    Browse the repository at this point in the history

  15. bugfix

    @peter-ch
    peter-ch committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    700363d View commit details
    Browse the repository at this point in the history

  16. Inputs don't participate in mating or data copying

    @peter-ch
    peter-ch committed Feb 25, 2019
    Configuration menu
    Copy the full SHA
    c79ef90 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2019

  1. Small mutation bugfix

    @peter-ch
    peter-ch committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    902aa7f View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2019

  1. Various fixes

    @peter-ch
    peter-ch committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    464c037 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2019

  1. Updates

    @peter-ch
    peter-ch committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    fcf000d View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2019

  1. Speciation bugfixes

    @peter-ch
    peter-ch committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    dc1de9a View commit details
    Browse the repository at this point in the history

  2. Bugfixes

    @peter-ch
    peter-ch committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    a511d4e View commit details
    Browse the repository at this point in the history

  3. Generational mode fix

    @peter-ch
    peter-ch committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    5d26484 View commit details
    Browse the repository at this point in the history

  4. Fixed Mutate_RemoveSimpleNeuron

    @peter-ch
    peter-ch committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    889809a View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2019

  1. Population ID accessible from Python

    @peter-ch
    peter-ch committed Apr 9, 2019
    Configuration menu
    Copy the full SHA
    03aaf70 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2019

  1. pyclasset added

    @peter-ch
    peter-ch committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    5d0cd80 View commit details
    Browse the repository at this point in the history

  2. Fixed merge conflicts

    @peter-ch
    peter-ch committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    d0afd6d View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2019

  1. 1231243

    @peter-ch
    peter-ch committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    36ba8d6 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2019

  1. wtf src/Genome.cpp was missing

    @peter-ch
    peter-ch committed Aug 25, 2019
    Configuration menu
    Copy the full SHA
    b60cb23 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2019

  1. Attempt to resolve conflicts

    @peter-ch
    peter-ch committed Aug 26, 2019
    Configuration menu
    Copy the full SHA
    c2dafd2 View commit details
    Browse the repository at this point in the history

  2. Fixes

    @peter-ch
    peter-ch committed Aug 26, 2019
    Configuration menu
    Copy the full SHA
    0dc93aa View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2020

  1. Updates

    @peter-ch
    peter-ch committed Jun 14, 2020
    Configuration menu
    Copy the full SHA
    79f52dd View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2020

  1. GenomeInitStruct added

    @peter-ch
    peter-ch committed Aug 3, 2020
    Configuration menu
    Copy the full SHA
    8053099 View commit details
    Browse the repository at this point in the history

  2. bugfix

    @peter-ch
    peter-ch committed Aug 3, 2020
    Configuration menu
    Copy the full SHA
    0e45812 View commit details
    Browse the repository at this point in the history

  3. no need to specify ID in genome constructor

    @peter-ch
    peter-ch committed Aug 3, 2020
    Configuration menu
    Copy the full SHA
    51832d1 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2020

  1. parameter changes

    @peter-ch
    peter-ch committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    e7199fd View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. small updates

    @peter-ch
    peter-ch committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    8c28ecf View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. update

    @peter-ch
    peter-ch committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    afc5a19 View commit details
    Browse the repository at this point in the history

  2. update

    @peter-ch
    peter-ch committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    0252842 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'genome_init_struct' 

    Genome init parameters now are contained in an object that is passed to the Genome constructor.
    @peter-ch
    peter-ch committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    7e3d9e3 View commit details
    Browse the repository at this point in the history