Update PSL-catalog on 2024-03-11

PSLmodels · Mar 11, 2024 · de6c7fc · de6c7fc
1 parent d59b56b
commit de6c7fc
Show file tree

Hide file tree

Showing 9 changed files with 4,362 additions and 7,981 deletions.
diff --git a/Catalog/Cost-of-Capital-Calculator.html b/Catalog/Cost-of-Capital-Calculator.html
@@ -62,7 +62,7 @@ <h5>A model to evaluate the effect of US federal taxes on businesses' investment
         <br />
         <div class="banner-image">
 
-          <img alt="Cost-of-Capital-Calculator" src="https://github.com/PSLmodels/Cost-of-Capital-Calculator/blob/master/docs/ccc.png" />
+          <img alt="Cost-of-Capital-Calculator" src="https://raw.githubusercontent.com/PSLmodels/Cost-of-Capital-Calculator/master/docs/ccc.png" />
 
         </div>
       </div>

diff --git a/Catalog/OG-Core.html b/Catalog/OG-Core.html
@@ -56,13 +56,13 @@
 
           <h1>OG-Core</h1>
           <br />
-          <h5><p>A General Overlapping-Generations Model for Evaluating Fiscal Policy</p></h5>
+          <h5>Core theory and code for large-scale open source overlapping generations model of region-specific fiscal policy</h5>
 
         </div>
         <br />
         <div class="banner-image">
 
-          <img alt="OG-Core" src="../imgs/PSL.svg" />
+          <img alt="OG-Core" src="https://raw.githubusercontent.com/PSLmodels/OG-Core/master/docs/OG-Core_logo.png" />
 
         </div>
       </div>
@@ -71,37 +71,75 @@ <h5><p>A General Overlapping-Generations Model for Evaluating Fiscal Policy</p><
     <div class="text-box">
       <div class="box-header"></div>
       <div class="box-content">
-         <p>| | | | --- | --- | | Org | <a href="https://www.PSLmodels.org"><img alt="PSL cataloged" src="https://img.shields.io/badge/PSL-cataloged-a0a0a0.svg" /></a> <a href="https://github.com/PSLmodels/OG-Core/blob/master/LICENSE"><img alt="OS License: CCO-1.0" src="https://img.shields.io/badge/OS%20License-CCO%201.0-yellow" /></a> <a href="https://pslmodels.github.io/OG-Core/"><img alt="Jupyter Book Badge" src="https://jupyterbook.org/badge.svg" /></a> | | Package | <a href="https://www.python.org/downloads/release/python-3916/"><img alt="Python 3.9" src="https://img.shields.io/badge/python-3.9-blue.svg" /></a> <a href="https://www.python.org/downloads/release/python-3108/"><img alt="Python 3.10" src="https://img.shields.io/badge/python-3.10-blue.svg" /></a> <a href="https://www.python.org/downloads/release/python-3118/"><img alt="Python 3.11" src="https://img.shields.io/badge/python-3.10-blue.svg" /></a> <a href="https://pypi.org/project/ogcore/"><img alt="PyPI Latest Release" src="https://img.shields.io/pypi/v/ogcore.svg" /></a> <a href="https://pypi.org/project/ogcore/"><img alt="PyPI Downloads" src="https://img.shields.io/pypi/dm/ogcore.svg?label=PyPI%20downloads" /></a> <a href="https://github.com/psf/black"><img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg" /></a> | | Testing | <img alt="example event parameter" src="https://github.com/PSLmodels/OG-Core/actions/workflows/build_and_test.yml/badge.svg?branch=master" /> <img alt="example event parameter" src="https://github.com/PSLmodels/OG-Core/actions/workflows/deploy_docs.yml/badge.svg?branch=master" /> <img alt="example event parameter" src="https://github.com/PSLmodels/OG-Core/actions/workflows/check_black.yml/badge.svg?branch=master" /> <a href="https://codecov.io/gh/PSLmodels/OG-Core"><img alt="Codecov" src="https://codecov.io/gh/PSLmodels/OG-Core/branch/master/graph/badge.svg" /></a> |</p> <p>OG-Core is an overlapping-generations (OG) model core theory, logic, and solution method algorithms that allow for dynamic general equilibrium analysis of fiscal policy. OG-Core provides a general framework and is a dependency of several country-specific OG models, such as <a href="https://github.com/PSLmodels/OG-USA">OG-USA</a> and <a href="https://github.com/PSLmodels/OG-UK">OG-UK</a>. The model output includes changes in macroeconomic aggregates (GDP, investment, consumption), wages, interest rates, and the stream of tax revenues over time. Regularly updated documentation of the model theory--its output, and solution method--and the Python API is available <a href="https://pslmodels.github.io/OG-Core">here</a>.</p> 
+         https://raw.githubusercontent.com/PSLmodels/OG-Core/master/README.md 
       </div>
     </div>
 
 
 
+    <div class="custom-section">
+
+      <div class="box">
+        <i class="fas fa-file-alt"> </i>
+        <h3>Policy Area</h3>
+        <p>Policy analysis<br />policy reform<br />fiscal policy<br />tax<br />benefits<br />social security<br />public finance<br />macroeconomic analysis<br />general equilibrium<br />dynamic scoring<br />overlapping generations<br />OG<br />OLG</p>
+      </div>
+
+      <div class="box">
+        <i class="fas fa-globe"> </i>
+        <h3>Geography</h3>
+        <p>World<br />generic<br />country-specific<br />region-specific</p>
+      </div>
+
+      <div class="box">
+        <i class="fas fa-code"> </i>
+        <h3>Language</h3>
+        <p>Python</p>
+      </div>
+
+    </div>
+
 
     <div class="button-container">
-       <a class="button" href="https://pslmodels.github.io/OG-Core">User documentation</a><a class="button" href="https://github.com/PSLmodels/OG-Core#usingcontributing-to-OG-Core">Contributor documentation</a> 
+
+      <a class="button" href="https://github.com/PSLmodels/OG-Core"
+        >Code Repository</a
+      >
+
+      <a class="button" href="https://pslmodels.github.io/OG-Core"
+        >User Documentation</a
+      >
+
+      <a class="button" href="https://pslmodels.github.io/OG-Core/content/contributing/contributor_guide.html"
+        >Contributor Documentation</a
+      >
+
+      <a class="button" href="https://github.com/PSLmodels/OG-Core/blob/master/CHANGELOG.md"
+        >Recent Changes</a
+      >
+
     </div>
 
     <section class="maintainers-section">
       <h2>Maintainers:</h2>
       <div class="maintainer-container">
         <div class="maintainers-grid">
-              
-          <a class="maintainer-card" href="https://sites.google.com/site/rickecon/">
+
+          <a class="maintainer-card" href="https://github.com/rickecon">
             <button class="maintainer-image-btn">
               <img
                 alt="Richard W. Evans"
-                src="../imgs/default-maintainer.jpg"
+                src="https://github.com/rickecon.png"
               />
             </button>
             <p>Richard W. Evans</p>
           </a>
-            
-          <a class="maintainer-card" href="http://jasondebacker.com">
+
+          <a class="maintainer-card" href="https://github.com/jdebacker">
             <button class="maintainer-image-btn">
               <img
                 alt="Jason DeBacker"
-                src="../imgs/default-maintainer.jpg"
+                src="https://github.com/jdebacker.png"
               />
             </button>
             <p>Jason DeBacker</p>

diff --git a/Catalog/OG-USA.html b/Catalog/OG-USA.html
@@ -56,13 +56,13 @@
 
           <h1>OG-USA</h1>
           <br />
-          <h5><p>Overlapping-Generations Model for Evaluating Fiscal Policy in the United States</p></h5>
+          <h5>Large-scale open source overlapping generations model of US fiscal policy</h5>
 
         </div>
         <br />
         <div class="banner-image">
 
-          <img alt="OG-USA" src="../imgs/PSL.svg" />
+          <img alt="OG-USA" src="https://raw.githubusercontent.com/PSLmodels/OG-USA/master/docs/OG-USA_logo.png" />
 
         </div>
       </div>
@@ -71,37 +71,77 @@ <h5><p>Overlapping-Generations Model for Evaluating Fiscal Policy in the United
     <div class="text-box">
       <div class="box-header"></div>
       <div class="box-content">
-         <p>| | | | --- | --- | | Org | <a href="https://www.PSLmodels.org"><img alt="PSL cataloged" src="https://img.shields.io/badge/PSL-cataloged-a0a0a0.svg" /></a> <a href="https://github.com/PSLmodels/OG-USA/blob/master/LICENSE"><img alt="OS License: CC0-1.0" src="https://img.shields.io/badge/OS%20License-CC0%201.0-yellow" /></a> <a href="https://pslmodels.github.io/OG-Core/"><img alt="Jupyter Book Badge" src="https://jupyterbook.org/badge.svg" /></a> | | Package | <a href="https://www.python.org/downloads/release/python-3917/"><img alt="Python 3.9" src="https://img.shields.io/badge/python-3.9-blue.svg" /></a> <a href="https://www.python.org/downloads/release/python-31013/"><img alt="Python 3.10" src="https://img.shields.io/badge/python-3.10-blue.svg" /></a> <a href="https://www.python.org/downloads/release/python-3116/"><img alt="Python 3.11" src="https://img.shields.io/badge/python-3.11-blue.svg" /></a> <a href="https://pypi.org/project/ogusa/"><img alt="PyPI Latest Release" src="https://img.shields.io/pypi/v/ogusa.svg" /></a> <a href="https://pypi.org/project/fiscalsim-us/"><img alt="PyPI Downloads" src="https://img.shields.io/pypi/dm/ogusa.svg?label=PyPI%20downloads" /></a> <a href="https://github.com/psf/black"><img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg" /></a> | | Testing | <img alt="example event parameter" src="https://github.com/PSLmodels/OG-USA/actions/workflows/build_and_test.yml/badge.svg?branch=master" /> <img alt="example event parameter" src="https://github.com/PSLmodels/OG-USA/actions/workflows/deploy_docs.yml/badge.svg?branch=master" /> <img alt="example event parameter" src="https://github.com/PSLmodels/OG-USA/actions/workflows/check_format.yml/badge.svg?branch=master" /> <a href="https://codecov.io/gh/PSLmodels/OG-USA"><img alt="Codecov" src="https://codecov.io/gh/PSLmodels/OG-USA/branch/master/graph/badge.svg" /></a> |</p> <p>OG-USA is an overlapping-generations (OG) model that allows for dynamic general equilibrium analysis of fiscal policy for the United States. OG-USA is built on the <a href="https://github.com/PSLmodels/OG-Core">OG-Core</a> framework. The model output includes changes in macroeconomic aggregates (GDP, investment, consumption), wages, interest rates, and the stream of tax revenues over time. Regularly updated documentation of the model theory--its output, and solution method--and the Python API is available at <a href="https://pslmodels.github.io/OG-Core">https://pslmodels.github.io/OG-Core</a> and documentation of the specific United States calibration of the model is available at <a href="https://pslmodels.github.io/OG-USA">https://pslmodels.github.io/OG-USA</a>.</p> <h5>Disclaimer</h5> <p>The model is constantly under development, and model components could change significantly. The package will have released versions, which will be checked against existing code prior to release. Stay tuned for an upcoming release!</p> 
+         https://raw.githubusercontent.com/PSLmodels/OG-USA/master/README.md 
       </div>
     </div>
 
 
 
+    <div class="custom-section">
+
+      <div class="box">
+        <i class="fas fa-file-alt"> </i>
+        <h3>Policy Area</h3>
+        <p>Policy analysis<br />policy reform<br />fiscal policy<br />tax<br />benefits<br />social security<br />public finance<br />macroeconomic analysis<br />general equilibrium<br />dynamic scoring<br />overlapping generations<br />OG<br />OLG</p>
+      </div>
+
+      <div class="box">
+        <i class="fas fa-globe"> </i>
+        <h3>Geography</h3>
+        <p>USA</p>
+      </div>
+
+      <div class="box">
+        <i class="fas fa-code"> </i>
+        <h3>Language</h3>
+        <p>Python</p>
+      </div>
+
+    </div>
+
 
     <div class="button-container">
-       <a class="button" href="https://pslmodels.github.io/OG-USA/content/intro/intro.html">User documentation</a><a class="button" href="https://github.com/PSLmodels/OG-USA#usingcontributing-to-og-usa">Contributor documentation</a> 
+
+      <a class="button" href="https://github.com/PSLmodels/OG-USA"
+        >Code Repository</a
+      >
+
+      <a class="button" href="https://pslmodels.github.io/OG-USA"
+        >User Documentation</a
+      >
+
+      <a class="button" href="https://pslmodels.github.io/OG-USA/content/contributing/contributor_guide.html"
+        >Contributor Documentation</a
+      >
+
+      <a class="button" href="forthcoming">Webapp</a>
+
+      <a class="button" href="https://github.com/PSLmodels/OG-USA/blob/master/CHANGELOG.md"
+        >Recent Changes</a
+      >
+
     </div>
 
     <section class="maintainers-section">
       <h2>Maintainers:</h2>
       <div class="maintainer-container">
         <div class="maintainers-grid">
-              
-          <a class="maintainer-card" href="https://sites.google.com/site/rickecon/">
+
+          <a class="maintainer-card" href="https://github.com/rickecon">
             <button class="maintainer-image-btn">
               <img
                 alt="Richard W. Evans"
-                src="../imgs/default-maintainer.jpg"
+                src="https://github.com/rickecon.png"
               />
             </button>
             <p>Richard W. Evans</p>
           </a>
-            
-          <a class="maintainer-card" href="http://jasondebacker.com">
+
+          <a class="maintainer-card" href="https://github.com/jdebacker">
             <button class="maintainer-image-btn">
               <img
                 alt="Jason DeBacker"
-                src="../imgs/default-maintainer.jpg"
+                src="https://github.com/jdebacker.png"
               />
             </button>
             <p>Jason DeBacker</p>
-Original file line number
+Diff line change
@@ Expand Up @@
             <br />
             <div class="banner-image">
-              <img alt="Cost-of-Capital-Calculator" src="https://github.com/PSLmodels/Cost-of-Capital-Calculator/blob/master/docs/ccc.png" />
+              <img alt="Cost-of-Capital-Calculator" src="https://raw.githubusercontent.com/PSLmodels/Cost-of-Capital-Calculator/master/docs/ccc.png" />
             </div>
           </div>
@@ Expand Down @@