Skip to content

Commit 6dfc65a

Browse files
committed
More docs
1 parent 9d8aba1 commit 6dfc65a

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

configuration/demos_config.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ index_col = "year"
8080
# Modules configuration
8181
[employment_module_config.simultaneous_calibration_config]
8282
tolerance = 100
83-
max_iter = 2
83+
max_iter = 20
8484
learning_rate = 2
8585
momentum_weight = 0.3
8686

@@ -89,7 +89,7 @@ momentum_weight = 0.3
8989
procedure_type = "rmse_error"
9090
tolerance_type = "absolute"
9191
tolerance = 1000
92-
max_iter = 2 # 1000
92+
max_iter = 1000
9393
[mortality_module_config.calibration_procedure.observed_values_table]
9494
file_type = "csv"
9595
table_name = "observed_fatalities_data"
@@ -101,7 +101,7 @@ index_col = "year"
101101
procedure_type = "rmse_error"
102102
tolerance_type = "absolute"
103103
tolerance = 1000
104-
max_iter = 2 # 1000
104+
max_iter = 1000
105105
[birth_module_config.calibration_procedure.observed_values_table]
106106
file_type = "csv"
107107
table_name = "observed_births_data"
@@ -113,8 +113,8 @@ index_col = "year"
113113
geoid_col = "lcm_county_id"
114114

115115
[hh_reorg_module_config.simultaneous_calibration_config]
116-
tolerance = 1_000
117-
max_iter = 2 # 100
116+
tolerance = 5_000
117+
max_iter = 100
118118
learning_rate = 2.5
119119
momentum_weight = 0.3
120120

docs/source/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
"deflist",
6868
"html_admonition",
6969
"html_image",
70+
"colon_fence"
7071
]
7172

7273
# Sphinx multiversion config

docs/source/pages/intro.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
DEMOS is a modular demographic microsimulator. It operates on tabular data representing agents or entities (primarily persons and households), and is configured via a simple TOML file. DEMOS can be run from source or using Docker for reproducibility.
44

5+
This document summarizes instructions to install, configure and run DEMOS. Sections 1-4 will help you correctly organize the data and configuration file, so we recommend reading them once before attempting to run DEMOS.
6+
7+
```{contents}
8+
:local:
9+
:depth: 2
10+
:backlinks: none
11+
:class: this-will-duplicate-information-and-it-is-still-useful-here
12+
```
513

614
## 1. Installation
715

@@ -23,14 +31,14 @@ DEMOS is a modular demographic microsimulator. It operates on tabular data repre
2331

2432
1. **Run with Docker Compose**:
2533
```bash
26-
docker-compose up
34+
docker compose up
2735
```
2836

2937
By default, this assumes that your config file is located in `./configuration/demos_config.toml` and the data folder is `./data`, with `./` being the root of the project (See the [file stucture section](#file-tree-structure-for-data-and-configuration) for details on how to organize the input data).
3038
If you need to specify a different location for them, you can run:
3139

3240
```bash
33-
DEMOS_CONFIG_PATH=<path-to-config> DEMOS_DATA_DIR=<path-to-data-dir> docker-compose up
41+
DEMOS_CONFIG_PATH=<path-to-config> DEMOS_DATA_DIR=<path-to-data-dir> docker compose up
3442
```
3543

3644
1. **Or run with Docker directly**:

0 commit comments

Comments
 (0)