Skip to content

Commit

Permalink
Updated with revised figures (script and output files)
Browse files Browse the repository at this point in the history
Added a README to the analysis directory
Updated README with clearer information of the contents
Removed old output figures
  • Loading branch information
saxarona committed Oct 18, 2023
1 parent 5c1f3f4 commit 6679ee9
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 44 deletions.
8 changes: 4 additions & 4 deletions README.md
Expand Up @@ -26,14 +26,14 @@ srun julia archipelago.jl
## Code structure

The wrapper script for a parallel run is `archipelago.jl`.
Its single core equivalent is `singlecore.jl`.
Its serial equivalent is `singlecore.jl`.

Generated data for parallel runs can be found in the `data` directory.
Single core data is in the `singlecore` directory.
The serial approach data is in the `singlecore` directory.

Utilities for data handling and plotting can be found in the `analysis` directory.

All core additions to EvoLP.jl are in the `src/island.jl` file. The components are:
All core additions to EvoLP.jl are in the `src/island.jl` file. These added components are:

### Deme selection blocks

Expand Down Expand Up @@ -99,7 +99,7 @@ A generational GA (`islandGA`) with:
- Population size `popsize`: 30
- Iterations: 100
- Migration
- rate: `mu` (see below)
- rate: `mu` (see table below)
- selection policy: `RandomDemeSelector` with `k=0.1*popsize`
- replacement policy: `WorstDemeSelector` with `k=0.1*popsize`

Expand Down
13 changes: 13 additions & 0 deletions analysis/README.md
@@ -0,0 +1,13 @@
# Analysis scripts and tools

This folder contains multiple tools and files for the analysis:

- `analysis.jl`: a short script to join all CSV files in `data`. It generates DataFrame-ready CSVs for the parallel approach and their serial equivalent (with an `_s` at the end of the filename):
- `ackley.csv` and its serial equivalent: `ackley_s.csv`
- `eggholder`
- `michalewicz`
- `rana`
- `rosenbrock`
- `plots.ipynb`: a Jupyter notebook for generating the figures used in the paper. It creates:
- `figure1.pdf`
- `figure2.pdf`
Binary file modified analysis/figure1.pdf
Binary file not shown.
Binary file modified analysis/figure2.pdf
Binary file not shown.
80 changes: 40 additions & 40 deletions analysis/plots.ipynb

Large diffs are not rendered by default.

Binary file removed output.png
Binary file not shown.

0 comments on commit 6679ee9

Please sign in to comment.