Merge branch 'master' of https://github.com/DominicWC/HARK

.gitignore

@@ -289,3 +289,6 @@ settings.json
 .spyderproject
 spyproject
 .spyproject
+
+# 20240608: CDC added *private* to avoid accidentally uploading private material
+*private*

Documentation/CHANGELOG.md

@@ -8,6 +8,21 @@ For more information on HARK, see [our Github organization](https://github.com/e
 
 ## Changes
 
+### 0.15.1
+
+Release Date: June 15, 2024
+
+This minor release was produced prior to CEF 2024 to enable public usage of HARK with the SSJ toolkit.
+
+#### Major Changes
+
+none
+
+#### Minor Changes
+
+- Adds example of integration of HARK with SSJ toolkit. [#1447](https://github.com/econ-ark/HARK/pull/1447)
+- Maintains compatibility between EconForge interpolation and numba [#1457](https://github.com/econ-ark/HARK/pull/1457)
+
 ### 0.15.0
 
 Release Date: June 4, 2024
@@ -16,7 +31,7 @@ Note: Due to major changes on this release, you may need to adjust how AgentType
 
 This release drops support for Python 3.8 and 3.9, consistent with SPEC 0, and adds support for Python 3.11 and 3.12. We expect that all HARK features still work with the older versions, but they are no longer part of our testing regimen.
 
-### Major Changes
+#### Major Changes
 
 - Drop official support for Python 3.8 and 3.9, add support for 3.11 and 3.12. [#1415](https://github.com/econ-ark/HARK/pull/1415)
 - Replace object-oriented solvers with single function versions. [#1394](https://github.com/econ-ark/HARK/pull/1394)
@@ -28,7 +43,7 @@ This release drops support for Python 3.8 and 3.9, consistent with SPEC 0, and a
 - Such constructed inputs can use alternate parameterizations / formats by changing the `constructor` function and providing its arguments in `parameters`.
 - Move `HARK.datasets` to `HARK.Calibration` for better organization of data and calibration tools. [#1430](https://github.com/econ-ark/HARK/pull/1430)
 
-### Minor Changes
+#### Minor Changes
 
 - Add option to pass pre-built grid to `LinearFast`. [#1388](https://github.com/econ-ark/HARK/pull/1388)
 - Moves calculation of stable points out of ConsIndShock solver, into method called by post_solve [#1349](https://github.com/econ-ark/HARK/pull/1349)

Documentation/NARK/.latexmkrc

@@ -0,0 +1,14 @@
+# -*- mode: shell-script; coding: utf-8 -*-
+# Google 'latexmk' for explanation of this config file
+# latexmk at unix command line will compile the paper
+$do_cd = 1;
+#$clean_ext = "nav out snm dvi idv tmp xref 4tc out aux log fls fdb_latexmk synctex.gz toc svg png 4ct ps out.ps mk4 lg cfg css html yml upa upb";
+@generated_exts = (@generated_exts, 'blg','fdb_latexmk','fls', 'idv','md.tmp','mk4','lg','snm','synctex.gz', 'tex.cfg','nav','out','ps','ps_out','tex.mk4', 'tmp', 'upa','upb','toc','4ct');
+$bibtex_use=2;
+$pdf_mode = 1;
+$rc_report = 1;
+$pdflatex="pdflatex -interaction=nonstopmode %O %S";
+@default_files = ('*.tex');
+$aux_out_dir_report = 0;
+$silent  = 1;
+#warn "PATH = '$ENV{PATH}'\n";

Documentation/NARK/@resources-update-from-remote_private.sh

@@ -0,0 +1 @@
+/Volumes/Sync/GitHub/econ-ark/econ-ark-tools/@resources/bash/@resources-update-from-remote_private.sh

Documentation/NARK/@resources/bash/@resources-update-from-remote_private.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+# Pull down the latest @resources and replace local files
+# with the same names.  Leave alone any existing files
+# that do not have a counterpart in in the upstream
+# written by Claude, edited by CDC
+
+# script should live in directory of the @resources file to be updated
+
+# path to the directory the script lives in
+
+# Set the GitHub repository URL and the desired subdirectory
+repo_url="https://github.com/econ-ark/econ-ark-tools.git"
+
+# directory of this script
+here="$(realpath $(dirname $0))" # here=/Volumes/Data/Papers/BufferStockTheory/BufferStockTheory-Latest/
+
+# subdirectory path
+repo_subdir="@resources"
+
+repo_url_root="https://github.com/econ-ark/econ-ark-tools"
+resources="@resources"
+repo_dirpath="$repo_url_root/$resources"
+
+# Set the destination directory on your macOS computer
+dest_dir="$here/@resources"
+
+# Create a temporary directory for cloning the repository
+temp_dir=$(mktemp -d)
+
+# Clone the GitHub repository into the temporary directory
+git clone --depth 1 "$repo_url" "$temp_dir"
+
+# Navigate to the desired subdirectory within the cloned repository
+pushd . ; cd "$temp_dir/$repo_subdir"
+
+# Copy the contents of the subdirectory to the destination directory
+rsync -avh --delete --checksum --itemize-changes --out-format="%i %n%L" . "$dest_dir" | grep '^>f.*c' | tee >(awk 'END { if (NR == 0) print "\nno files were changed\n"; else print NR, "files were changed\n" }')
+
+# Remove the temporary directory
+#rm -rf "$temp_dir"
+
+# Return to the source directory
+popd

Documentation/NARK/@resources/symbols-mapping-latex.tex

@@ -0,0 +1,19 @@
+\newcommand{\aNrm}{a}
+\newcommand{\bNrm}{b}
+\newcommand{\cNrm}{c}
+\newcommand{\dNrm}{d}
+\newcommand{\eNrm}{e}
+\newcommand{\hNrm}{h}
+\newcommand{\wNrm}{w}
+\newcommand{\pNrm}{p}
+\newcommand{\kNrm}{k}
+\newcommand{\mNrm}{m}
+\newcommand{\vNrm}{v}
+\newcommand{\xNrm}{x}
+\newcommand{\yNrm}{y}
+\newcommand{\yNrm}{y}
+\newcommand{\zNrm}{z}
+\newcommand{\prd}{t}
+\newcommand{\prdt}{t}
+\newcommand{\prdT}{t}
+\newcommand{\trmT}{T}

Documentation/NARK/@resources/symbols-mapping-prettify

@@ -0,0 +1,55 @@
+("\aNrm" . ?a)
+("\bNrm" . ?b)
+("\cNrm" . ?c)
+("\dNrm" . ?d)
+("\eNrm" . ?e)
+("\hNrm" . ?h)
+("\wNrm" . ?w)
+("\pNrm" . ?p)
+("\kNrm" . ?k)
+("\mNrm" . ?m)
+("\vNrm" . ?v)
+("\xNrm" . ?x)
+("\yNrm" . ?y)
+("\yNrm" . ?y)
+("\zNrm" . ?z)
+("\prd" . ?t)
+("\prdt" . ?t)
+("\prdT" . ?t)
+("\trmT" . ?T)
+("\aLvl" . ?𝐚)
+("\bLvl" . ?𝐛)
+("\cLvl" . ?𝐜)
+("\hLvl" . ?𝐡)
+("\pLvl" . ?𝐩)
+("\kLvl" . ?𝐤)
+("\mLvl" . ?𝐦)
+("\vLvl" . ?𝐯)
+("\yLvl" . ?𝐲)
+("\Ex" . ?𝔼)
+("\PermGroFac" . ?𝒢)
+("\PermGroFacAdj" . ? )
+("\PermGroFacAdj" . ? )
+("\RNrm" . ?ℛ)
+("\vFunc" . ?𝚟)
+("\uFunc" . ?𝚞)
+("\cFunc" . ?𝚌)
+("\DiscFac" . ?β)
+("\std" . ?σ)
+("\CRRA" . ?ρ)
+("\Rfree" . ?R)
+("\Risky" . ?𝐑)
+("\Rport" . ?ℜ)
+("\Shr" . ?Ϛ)
+("\TranShkEmp" . ?θ)
+("\TranShkEmpDum" . ?ϑ)
+("\tranShkEmp" . ?θ)
+("\tranShkEmpDum" . ?ϑ)
+("\Nrml" . ?𝒩)
+("\arvl" . ?←)
+("\cntn" . ?→)
+("\BegMark" . ?←)
+("\EndMark" . ?→)
+("\wlthAftr" . ?ẃ)
+("\wlthBefr" . ?w)
+("\labor" . ?ℓ)

Documentation/NARK/@resources/symbols-mapping.bash

@@ -0,0 +1,94 @@
+#!/bin/bash
+
+letter_rules=(
+    "\\aNrm:a"
+    "\\bNrm:b"
+    "\\cNrm:c"
+    "\\dNrm:d"
+    "\\eNrm:e"
+    "\\hNrm:h"
+    "\\wNrm:w"
+    "\\pNrm:p"
+    "\\kNrm:k"
+    "\\mNrm:m"
+    "\\vNrm:v"
+    "\\xNrm:x"
+    "\\yNrm:y"
+    "\\yNrm:y"
+    "\\zNrm:z"
+    "\\prd:t"
+    "\\prdt:t"
+    "\\prdT:t"
+    "\\trmT:T"
+)
+unicode_rules=(
+    "\\aLvl:𝐚"
+    "\\bLvl:𝐛"
+    "\\cLvl:𝐜"
+    "\\hLvl:𝐡"
+    "\\pLvl:𝐩"
+    "\\kLvl:𝐤"
+    "\\mLvl:𝐦"
+    "\\vLvl:𝐯"
+    "\\yLvl:𝐲"
+    "\\Ex:𝔼"
+    "\\PermGroFac:𝒢"
+    "\\PermGroFacAdj: "
+    "\\PermGroFacAdj: "
+    "\\RNrm:ℛ"
+    "\\vFunc:𝚟"
+    "\\uFunc:𝚞"
+    "\\cFunc:𝚌"
+    "\\DiscFac:β"
+    "\\std:σ"
+    "\\CRRA:ρ"
+    "\\Rfree:R"
+    "\\Risky:𝐑"
+    "\\Rport:ℜ"
+    "\\Shr:Ϛ"
+    "\\TranShkEmp:θ"
+    "\\TranShkEmpDum:ϑ"
+    "\\tranShkEmp:θ"
+    "\\tranShkEmpDum:ϑ"
+    "\\Nrml:𝒩"
+    "\\arvl:←"
+    "\\cntn:→"
+    "\\BegMark:←"
+    "\\EndMark:→"
+    "\\wlthAftr:ẃ"
+    "\\wlthBefr:w"
+    "\\labor:ℓ"
+    )
+
+generate_prettify_rules() {
+    output_file="symbols-mapping-prettify"
+    > "$output_file"
+
+    for rule in "${letter_rules[@]}"; do
+	IFS=':' read -r command symbol <<< "$rule"
+	echo "(\"$command\" . ?$symbol)" >> "$output_file"
+    done
+
+    for rule in "${unicode_rules[@]}"; do
+	IFS=':' read -r command symbol <<< "$rule"
+	echo "(\"$command\" . ?$symbol)" >> "$output_file"
+    done
+
+    echo "Prettify rules generated in $output_file"
+}
+
+generate_prettify_rules
+
+generate_latex_commands() {
+    output_file="symbols-mapping-latex.tex"
+    > "$output_file"
+
+    for rule in "${letter_rules[@]}"; do
+	IFS=':' read -r command symbol <<< "$rule"
+	echo "\\newcommand{$command}{$symbol}" >> "$output_file"
+    done
+
+    echo "LaTeX commands generated in $output_file"
+}
+
+generate_latex_commands

Documentation/NARK/@resources/tex-add-search-paths.tex

@@ -0,0 +1,17 @@
+% Add the listed directories to the search path
+% (allows easy moving of files around later)
+% these paths are searched AFTER local config kpsewhich
+
+% *.sty, *.cls
+\makeatletter
+\def\input@path{{@resources/texlive/texmf-local/tex/latex//}
+        ,{@resources/texlive/latex//}
+        ,{@local//}
+        }
+\makeatother
+\makeatletter
+\def\bibinput@path{{@resources/texlive/texmf-local/tex/latex//}
+        ,{@resources/texlive/latex//},
+        ,{@local//}
+        }
+\makeatother