From f49b603153da595e2eac526f3281184c872cea42 Mon Sep 17 00:00:00 2001 From: Mitja Devetak Date: Fri, 3 May 2024 11:16:20 +0200 Subject: [PATCH 01/13] dynamic logo 1 --- README.md | 6 +++--- docs/Project.toml | 10 ---------- dynamic_logo.svg | 12 ++++++++++++ 3 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 docs/Project.toml create mode 100644 dynamic_logo.svg diff --git a/README.md b/README.md index 9928ad0..c12e7c7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

- -* + + *

# Behavioural agent-based economic forecasting @@ -84,4 +84,4 @@ the authors. All views expressed are personal views, not those of Bank of Italy.

* Credits to Sara Corbo for the logo and to Andrea Gentili for the name suggestion. -

\ No newline at end of file +

diff --git a/docs/Project.toml b/docs/Project.toml deleted file mode 100644 index db5e74a..0000000 --- a/docs/Project.toml +++ /dev/null @@ -1,10 +0,0 @@ -[deps] -Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" -Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819" -Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306" -NamedTupleTools = "d9ec5142-1e00-5aa0-9d6a-321866360f50" -Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" -BeforeIT = "ca9fcad7-41d0-4f76-b1e5-366c28bce52e" -StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" diff --git a/dynamic_logo.svg b/dynamic_logo.svg new file mode 100644 index 0000000..7ffca74 --- /dev/null +++ b/dynamic_logo.svg @@ -0,0 +1,12 @@ + + + + + + From a140cd6ce019e71495921fd5f5b4eef0c467abb1 Mon Sep 17 00:00:00 2001 From: Mitja Devetak Date: Fri, 3 May 2024 11:21:17 +0200 Subject: [PATCH 02/13] dynamic logo 2 --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c12e7c7..f019186 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ -

- - * -

+ + + + Logo adapts to light and dark modes + # Behavioural agent-based economic forecasting From 6839d04b7e4bdf17ef697ca3e935c836af50ff4d Mon Sep 17 00:00:00 2001 From: Mitja Devetak Date: Fri, 3 May 2024 11:22:11 +0200 Subject: [PATCH 03/13] dynamic logo 3 --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index f019186..bc70d1d 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ +
Logo adapts to light and dark modes +
# Behavioural agent-based economic forecasting From 3e05d99f0af652ed1986803d1fac4c83f7e7f387 Mon Sep 17 00:00:00 2001 From: Mitja Devetak Date: Fri, 3 May 2024 11:27:45 +0200 Subject: [PATCH 04/13] authors 1 --- README.md | 24 ++++++++++++++++++++++++ dynamic_logo.svg | 12 ------------ 2 files changed, 24 insertions(+), 12 deletions(-) delete mode 100644 dynamic_logo.svg diff --git a/README.md b/README.md index bc70d1d..cc6f620 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,30 @@ say `main.jl`, and run it directly from the terminal by typing julia --project=. main.jl ``` +## Contributors + +This project is brought to you by the following amazing people: + + + + + + +
+ + Aldo Glielmo
+ Aldo Glielmo +
+

Banca d'Italia ✉

+ 		+ + Mitja Devetak
+ Mitja Devetak +
+

Paris 1: Pantheon - Sorbonne ✉

+
+ + ## Disclaimer This package is an outcome of a research project. All errors are those of diff --git a/dynamic_logo.svg b/dynamic_logo.svg deleted file mode 100644 index 7ffca74..0000000 --- a/dynamic_logo.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - From 5d0657db4276feac86670ad72258bf2d3d61faae Mon Sep 17 00:00:00 2001 From: Mitja Devetak Date: Fri, 3 May 2024 11:30:18 +0200 Subject: [PATCH 05/13] authors 2 --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index cc6f620..b6825a1 100644 --- a/README.md +++ b/README.md @@ -77,10 +77,8 @@ say `main.jl`, and run it directly from the terminal by typing ``` julia --project=. main.jl ``` - ## Contributors -This project is brought to you by the following amazing people: @@ -89,14 +87,15 @@ This project is brought to you by the following amazing people: Aldo Glielmo
Aldo Glielmo
-

Banca d'Italia ✉

+

Banca d'Italia

+

Email: aldo [at] gmail.com

Mitja Devetak
Mitja Devetak
-

Paris 1: Pantheon - Sorbonne ✉

+

Paris 1: Pantheon - Sorbonne
From 6408c0159998f25c43824c90711fe965aa833f4d Mon Sep 17 00:00:00 2001 From: Mitja Devetak Date: Fri, 3 May 2024 11:41:23 +0200 Subject: [PATCH 06/13] download code 1 --- README.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/README.md b/README.md index b6825a1..e49a9bb 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,27 @@ say `main.jl`, and run it directly from the terminal by typing ``` julia --project=. main.jl ``` + + +## Download Source Code and Run Tests + +### Clone the Repository +```bash +git clone https://github.com/bancaditalia/BeforeIT.jl.git +cd BeforeIT.jl +``` + +### Activate and Instantiate the Environment +```bash +julia -e 'using Pkg; Pkg.activate("."); Pkg.instantiate();' +``` + +### Run Tests +```bash +julia --proj test/runtests.jl +``` + + ## Contributors From dff67e301d38588035eb9fcec2bcbb6dcfccc1ea Mon Sep 17 00:00:00 2001 From: Mitja Devetak Date: Fri, 3 May 2024 11:44:46 +0200 Subject: [PATCH 07/13] contributions 3 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e49a9bb..7154393 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ julia --proj test/runtests.jl ``` -## Contributors +## Current Authors @@ -109,7 +109,7 @@ julia --proj test/runtests.jl Aldo Glielmo

Banca d'Italia

-

Email: aldo [at] gmail.com

+

Email: aldo.glielmo@bancaditalia.it

From 4a01e2d549632b2d58c99e6da01a87d71be100b3 Mon Sep 17 00:00:00 2001 From: Mitja Devetak Date: Fri, 3 May 2024 11:57:23 +0200 Subject: [PATCH 08/13] toml fix 1 --- Project.toml | 6 ------ test/test_accounting_identities.jl | 1 - 2 files changed, 7 deletions(-) diff --git a/Project.toml b/Project.toml index 2dd823f..eeacb7e 100644 --- a/Project.toml +++ b/Project.toml @@ -4,14 +4,9 @@ authors = ["Aldo Glielmo "] version = "0.1.0" [deps] -CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" -DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" -DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab" -DistributedArrays = "aaf54ef3-cdf8-58ed-94cc-d582ad619b94" Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a" JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819" JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" @@ -21,7 +16,6 @@ Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -StatsPlots = "f3b207a7-027a-5e70-b257-86293d7955fd" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [compat] diff --git a/test/test_accounting_identities.jl b/test/test_accounting_identities.jl index efc2f40..896230a 100644 --- a/test/test_accounting_identities.jl +++ b/test/test_accounting_identities.jl @@ -1,5 +1,4 @@ using BeforeIT, MAT, FileIO, Random -using Plots using Test dir = @__DIR__ From cd0ecd8c8c5e3a4af87cd6204b70fefc429f5702 Mon Sep 17 00:00:00 2001 From: Mitja Devetak Date: Fri, 3 May 2024 12:11:07 +0200 Subject: [PATCH 09/13] toml fix 2 --- Project.toml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index eeacb7e..5875756 100644 --- a/Project.toml +++ b/Project.toml @@ -19,4 +19,12 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [compat] -julia = "1.7.2" +Distributions = "0.25" +FileIO = "1.16" +JLD2 = "0.4" +JuliaFormatter = "1.0.56" +MAT = "0.10" +NamedTupleTools = "0.14" +Plots = "1.40" +StatsBase = "0.34" +julia = "1.9" From c1b357469c10ff0c9207dfc4184155ddb1f9eaa5 Mon Sep 17 00:00:00 2001 From: Mitja Devetak Date: Fri, 3 May 2024 12:21:40 +0200 Subject: [PATCH 10/13] small update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7154393..80cf244 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ julia --proj test/runtests.jl

Email: aldo.glielmo@bancaditalia.it

 - + Mitja Devetak
Mitja Devetak
From 9f87c51d7caae7bdc9a9fd87ea914a4203464f08 Mon Sep 17 00:00:00 2001 From: Mitja Devetak Date: Fri, 3 May 2024 12:24:37 +0200 Subject: [PATCH 11/13] update toml 3 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 5875756..843b35b 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "BeforeIT" uuid = "ca9fcad7-41d0-4f76-b1e5-366c28bce52e" -authors = ["Aldo Glielmo "] +authors = ["Aldo Glielmo ", "Mitja Devetak "] version = "0.1.0" [deps] From 2183c5bf7a173b6048fb2fe7ceb1048026dbe93f Mon Sep 17 00:00:00 2001 From: Mitja Devetak Date: Fri, 3 May 2024 15:27:59 +0200 Subject: [PATCH 12/13] remove statistics as dependency --- Project.toml | 1 - examples/compare_model_vs_real.jl | 2 +- examples/get_parameters_and_initial_conditions.jl | 2 +- src/BeforeIT.jl | 1 - src/utils/estimate.jl | 2 +- test/markets/test_search_and_matching_mod.jl | 2 +- test/markets/test_search_and_matching_seed_stability.jl | 2 +- test/test_one_epoch.jl | 2 +- test/test_one_epoch_consistency.jl | 2 +- 9 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Project.toml b/Project.toml index 843b35b..2b181f4 100644 --- a/Project.toml +++ b/Project.toml @@ -14,7 +14,6 @@ MAT = "23992714-dd62-5051-b70f-ba57cb901cac" NamedTupleTools = "d9ec5142-1e00-5aa0-9d6a-321866360f50" Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" -Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/examples/compare_model_vs_real.jl b/examples/compare_model_vs_real.jl index 3242256..cd366ba 100644 --- a/examples/compare_model_vs_real.jl +++ b/examples/compare_model_vs_real.jl @@ -1,5 +1,5 @@ using BeforeIT -using MAT, FileIO, Plots, StatsPlots, Statistics +using MAT, FileIO, Plots, StatsPlots using Dates # load data from 1996 diff --git a/examples/get_parameters_and_initial_conditions.jl b/examples/get_parameters_and_initial_conditions.jl index 24e5552..75c20a8 100644 --- a/examples/get_parameters_and_initial_conditions.jl +++ b/examples/get_parameters_and_initial_conditions.jl @@ -1,7 +1,7 @@ # In this tutorial we illustrate how to calibrate the model to the Italian data for a specific quarter import BeforeIT as Bit -using Dates, Statistics, FileIO +using Dates, FileIO # We start from loading the calibration oject for italy, which contains 4 datasets: calibration_data, figaro, data, and ea diff --git a/src/BeforeIT.jl b/src/BeforeIT.jl index 909de20..a8346e3 100644 --- a/src/BeforeIT.jl +++ b/src/BeforeIT.jl @@ -1,6 +1,5 @@ module BeforeIT -using Statistics using Random using StatsBase import Base: round, length diff --git a/src/utils/estimate.jl b/src/utils/estimate.jl index 415143c..bbcbb49 100644 --- a/src/utils/estimate.jl +++ b/src/utils/estimate.jl @@ -1,4 +1,4 @@ -using LinearAlgebra, Random, Statistics, Distributions +using LinearAlgebra, Random, Distributions function estimate_next_value(data, type = nothing) alpha, beta, epsilon = estimate(data) diff --git a/test/markets/test_search_and_matching_mod.jl b/test/markets/test_search_and_matching_mod.jl index 31bd6e8..2d52a40 100644 --- a/test/markets/test_search_and_matching_mod.jl +++ b/test/markets/test_search_and_matching_mod.jl @@ -1,4 +1,4 @@ -using BeforeIT, Test, MAT, Statistics +using BeforeIT, Test, MAT, StatsBase using Random Random.seed!(1) diff --git a/test/markets/test_search_and_matching_seed_stability.jl b/test/markets/test_search_and_matching_seed_stability.jl index a945b86..ead71da 100644 --- a/test/markets/test_search_and_matching_seed_stability.jl +++ b/test/markets/test_search_and_matching_seed_stability.jl @@ -1,4 +1,4 @@ -using BeforeIT, Test, MAT, Statistics +using BeforeIT, Test, MAT, StatsBase using Random Random.seed!(1) diff --git a/test/test_one_epoch.jl b/test/test_one_epoch.jl index 4e8e8f9..40535f2 100644 --- a/test/test_one_epoch.jl +++ b/test/test_one_epoch.jl @@ -3,7 +3,7 @@ function randn(n1::Int, n2::Int) return ones(n1, n2) end -using BeforeIT, MAT, Test, Statistics +using BeforeIT, MAT, Test, StatsBase dir = @__DIR__ diff --git a/test/test_one_epoch_consistency.jl b/test/test_one_epoch_consistency.jl index 591bae1..7825b7a 100644 --- a/test/test_one_epoch_consistency.jl +++ b/test/test_one_epoch_consistency.jl @@ -1,7 +1,7 @@ using Revise using BeforeIT using MAT -using Test, Statistics +using Test dir = @__DIR__ From aa9b53a6fcbed398ab46498dd6dfdb9bfc7421a5 Mon Sep 17 00:00:00 2001 From: Mitja Devetak Date: Fri, 3 May 2024 16:15:37 +0200 Subject: [PATCH 13/13] remove Plots as dependency --- Project.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Project.toml b/Project.toml index 2b181f4..f903ae9 100644 --- a/Project.toml +++ b/Project.toml @@ -12,7 +12,6 @@ JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" MAT = "23992714-dd62-5051-b70f-ba57cb901cac" NamedTupleTools = "d9ec5142-1e00-5aa0-9d6a-321866360f50" -Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" @@ -24,6 +23,5 @@ JLD2 = "0.4" JuliaFormatter = "1.0.56" MAT = "0.10" NamedTupleTools = "0.14" -Plots = "1.40" StatsBase = "0.34" julia = "1.9"