Skip to content

Commit

Permalink
update copyright
Browse files Browse the repository at this point in the history
  • Loading branch information
@ferrall
ferrall committed Mar 10, 2023
1 parent 2d49746 commit cf81f7f
Show file tree
Hide file tree
Showing 64 changed files with 131 additions and 115 deletions.
5 changes: 3 additions & 2 deletions docs/default.html
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html>
<link rel="icon" href="icons/nicon16.png" type="image/png">
<head>
<link rel="icon" href="icons/nicon16.png" type="image/png">
<meta http-equiv="refresh" content="3;url=niqlow.ox.html" />
<style>
body {
body {
background-image: url("niqlow.svg");
background-repeat:no-repeat;
background-color:#980000ff ;
Expand Down
5 changes: 3 additions & 2 deletions docs/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<html>
<link rel="icon" href="icons/nicon16.png" type="image/png">
<head>
<link rel="icon" href="icons/nicon16.png" type="image/png">
<meta http-equiv="refresh" content="3;url=niqlow.ox.html" />
<style>
body {
body {
background-image: url("niqlow.svg");
background-repeat:no-repeat;
background-color:#980000ff ;
Expand Down
4 changes: 2 additions & 2 deletions docs/niqlow.ox.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ <h1><span class="icon"><img class="icon" src="icons/file.png">&nbsp;</span><span
<P/>
<td><details class="over"><summary>Step 2. Solve the model</summary>
<ul>
<li>Use of the solution built in <a href="">Method</a>s to solve Bellman's equation for your model.</li>
<li>Create <a href="">Data</a> outcomes for the solution.</td>
<li>Use the <a href="DDP/Methods.ox.html">Method</a>s to solve Bellman's equation and compute choice probabilities for your model.</li>
<li>Create <a href="DDP/Data.ox.html">Data</a> outcomes for the solution (simulated sample or predictions).</td>
</ul></details>
<td><details class="over"><summary>Step 3. Find parameter values</summary>
<UL><li>Use the integrated <a href="FiveO/default.html">FiveO</a> tools to maximize an objective or solve a system of
Expand Down
2 changes: 1 addition & 1 deletion examples/DDP/AllTest.ox
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "AllTest.h"
/* This file is part of niqlow. Copyright (C) 2011-2021 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2011-2023 Christopher Ferrall */

/** This creates and returns a menu for the test programs, called in examples/DDP/examples. **/
TestRun() {
Expand Down
2 changes: 1 addition & 1 deletion examples/FiveO/AllTestOpt.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**/
#import "FiveO"
#import "menu"
/* This file is part of niqlow. Copyright (C) 2011-2020 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2011-2023 Christopher Ferrall */
#ifndef _RB
#define _RB
#include "Rosenbrock.ox"
Expand Down
2 changes: 1 addition & 1 deletion examples/FiveO/AllTestOpt.ox
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "AllTestOpt.h"
/* This file is part of niqlow. Copyright (C) 2011-2021 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2011-2023 Christopher Ferrall */

/** Produce menu of simple uses of FiveO.**/
OptTestRun() {
Expand Down
2 changes: 1 addition & 1 deletion examples/FiveO/GetStartedFiveO.ox
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "Rosenbrock.ox"
#endif
#include "SysExample.ox"
/* This file is part of niqlow. Copyright (C) 2011-2021 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2011-2023 Christopher Ferrall */

static decl key;
GS5OA() {
Expand Down
2 changes: 1 addition & 1 deletion examples/main.ox
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "main.h"
/* This file is part of niqlow. Copyright (C) 2011-2020 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2011-2023 Christopher Ferrall */

/** Present a menu of test, sample and replication functions to call; will also read options from
the command line.
Expand Down
2 changes: 1 addition & 1 deletion examples/misc/DynamicWstar.ox
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "DynamicWstar.h"
/* This file is part of niqlow. Copyright (C) 2011-2020 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2011-2023 Christopher Ferrall */

DynWStar::Reachable() { return (CV(m)||!CV(keptz)); }
DynWStar::DynWStar() { zstar = zeros(N::R,1); oxrunerror("should get rid of N::R");}
Expand Down
2 changes: 1 addition & 1 deletion examples/misc/StataMNP.ox
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "StataMNP.h"
/* This file is part of niqlow. Copyright (C) 2011-2012 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2011-2023 Christopher Ferrall */

StataMNP() {
format(250);
Expand Down
2 changes: 1 addition & 1 deletion examples/misc/StataMNP.oxdoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ Cons -0.985592056717 0.413310145637 -2.38463068744

<a href="../output/StataMNP.txt">Complete (noisy) output</a>

@author &copy; 2011-2022 <a href="http://econ.queensu.ca/~ferrall">Christopher Ferrall</a></dd>
@author &copy; 2011-2023 <a href="http://econ.queensu.ca/~ferrall">Christopher Ferrall</a></dd>
**/
2 changes: 1 addition & 1 deletion examples/replications/BerkovecSternEmet1991.ox
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "BerkovecSternEmet1991.h"
/* This file is part of niqlow. Copyright (C) 2011-2018 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2011-2023 Christopher Ferrall */

/** Setup and solve the model for both columns.**/
Retirement::Run() {
Expand Down
2 changes: 1 addition & 1 deletion examples/replications/GilleskieEmet1998.ox
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "GilleskieEmet1998.h"
/* This file is part of niqlow. Copyright (C) 2011-2013 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2011-2023 Christopher Ferrall */

DynaHealth::NewEpisode() { return !spell.k.v; }

Expand Down
2 changes: 1 addition & 1 deletion examples/replications/KeaneWolpinJPE1997.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "DDP"
/* This file is part of niqlow. Copyright (C) 2012-2020 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2012-2023 Christopher Ferrall */


struct KWJPE97 : ExPostSmoothing {
Expand Down
2 changes: 1 addition & 1 deletion examples/replications/KeaneWolpinJPE1997.ox
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "KeaneWolpinJPE1997.h"
/* This file is part of niqlow. Copyright (C) 2019-2020 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2019-2023 Christopher Ferrall */

/** Distribution of fixed effects conditional on initial schooling level.**/
KWJPE97::kdist(...) { return kprob[][CV(isch)]; }
Expand Down
2 changes: 1 addition & 1 deletion examples/replications/KeaneWolpinREStat1994.oxdoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@ Note that &Ecirc;max is defined to be at least maxE, and when the algorithm has
<DD class="example"><details><summary>Output <a href="javascript:popoxcode('../../../examples/output/KeaneWolpinREStat1994.txt');">niqlow/examples/output/KeaneWolpinREStat1994.txt</a></summary>
<pre><object width="75%" height="200" type="text/plain" data="../../../examples/output/KeaneWolpinREStat1994.txt" border="1" ></object></pre></details></DD>

@author &copy; 2011-2021 <a href="https://ferrall.github.io/">Christopher Ferrall</a></dd>
@author &copy; 2011-2023 <a href="https://ferrall.github.io/">Christopher Ferrall</a></dd>

**/
2 changes: 1 addition & 1 deletion examples/replications/RustEmet1987mle.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#import "RustEmet1987"
#import "FiveO"
/* This file is part of niqlow. Copyright (C) 2011-2022 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2011-2023 Christopher Ferrall */

/** Contains objects related to estimation in a catchall class.
Expand Down
2 changes: 1 addition & 1 deletion examples/replications/RustEmet1987mle.ox
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "RustEmet1987mle.h"
/* This file is part of niqlow. Copyright (C) 2011-2022 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2011-2023 Christopher Ferrall */

/** Creates the interactive menu items for choosing method, table, column, and row to replicate.**/
RustEstimates::menu() {
Expand Down
2 changes: 1 addition & 1 deletion examples/replications/WolpinEmet1987.ox
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "WolpinEmet1987.h"
/* This file is part of niqlow. Copyright (C) 2011-2020 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2011-2023 Christopher Ferrall */

SchToWork::Replicate() {
Initialize(new SchToWork(),new BinaryChoice("accept"));
Expand Down
2 changes: 1 addition & 1 deletion examples/replications/WolpinJPE1984.ox
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "WolpinJPE1984.h"
/* This file is part of niqlow. Copyright (C) 2011-2020 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2011-2023 Christopher Ferrall */

/**Run the replication, compute predictions.
**/
Expand Down
2 changes: 1 addition & 1 deletion examples/replications/replications.ox
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** Menus of programs to replicate published DDP work: see <a href="replications/default.html">documentation</a>.
**/
#include "replications.h"
/* This file is part of niqlow. Copyright (C) 2011-2020 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2011-2023 Christopher Ferrall */

/** Options built closely on Rust 1987.**/
rust87menu() {
Expand Down
2 changes: 1 addition & 1 deletion include/Algorithms.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#import "Shared"
#import <solveqp>
/* This file is part of niqlow. Copyright (C) 2012-2021 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2012-2023 Christopher Ferrall */

/** Base class for optimization and system-solving algorithms.
Expand Down
2 changes: 1 addition & 1 deletion include/Bellman.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "DP"
/* This file is part of niqlow. Copyright (C) 2011-2021 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2011-2023 Christopher Ferrall */

/** Base class for any DP problem and each point $\theta$ in the endogenous state space.
Expand Down
2 changes: 1 addition & 1 deletion include/DP.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "Variables"
/* This file is part of niqlow. Copyright (C) 2011-2021 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2011-2023 Christopher Ferrall */

#ifdef OX_PARALLEL
extern decl
Expand Down
2 changes: 1 addition & 1 deletion include/Objective.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#import "Parameters"
#import <database>
/* This file is part of niqlow. Copyright (C) 2012-2021 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2012-2023 Christopher Ferrall */

/** Tags for Gradient-based optimization algorithms. @name QuasiAlgorithms**/
enum{USEBHHH,USEBFGS,USEDFP,USESTEEP,USENEWTON,QuasiAlgorithms}
Expand Down
2 changes: 1 addition & 1 deletion include/Outcomes.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#import "database"
#import "Bellman"

/* This file is part of niqlow. Copyright (C) 2012-2021 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2012-2023 Christopher Ferrall */

SimulateOutcomes(Nsim=UseDefault,T=UseDefault,fname=UseDefault,ErgOrStateMat=0,DropTerminal=FALSE);

Expand Down
4 changes: 2 additions & 2 deletions include/Parameters.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "Shared"
/* This file is part of niqlow. Copyright (C) 2012-2020 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2012-2023 Christopher Ferrall */

NormalDistParmeters(L,ivals=<0.0;1.0>);

Expand Down Expand Up @@ -161,7 +161,7 @@ struct ParameterBlock : Parameter {
ParameterBlock(L="PB",...);
AddToBlock(...);
ToggleDoNotVary(elements=DoAll);
SetDoNotVary(setting);
SetDoNotVary(setting);
Xb(X);
virtual BlockCode();
virtual Encode();
Expand Down
2 changes: 1 addition & 1 deletion include/Predictions.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#import "database"
#import "Bellman"
/* This file is part of niqlow. Copyright (C) 2012-2021 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2012-2023 Christopher Ferrall */

ComputePredictions(T=UseDefault,prtlevel=Two);

Expand Down
2 changes: 1 addition & 1 deletion include/ReservationValues.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "FiveO"
/* This file is part of niqlow. Copyright (C) 2012-2020 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2012-2023 Christopher Ferrall */

RVSolve(ToScreen=TRUE,aM=FALSE);

Expand Down
4 changes: 2 additions & 2 deletions include/Shared.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</OL>
@author &copy; 2011-2021 <a href="https://ferrall.github.io/">Christopher Ferrall</a> </dd>
@author &copy; 2011-2023 <a href="https://ferrall.github.io/">Christopher Ferrall</a> </dd>
<a name="auto"><hr><h1>Documentation of Items Defined in Shared.ox <a href="#"><span class="skip"><abbr title=" Back to top">&nbsp;&#8679;&nbsp;</abbr></span></a></h1></a>
**/
Expand All @@ -24,7 +24,7 @@

// extern "CFcurl,fget" curl_get(url,file);

/* This file is part of niqlow. Copyright (C) 2012-2021 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2012-2023 Christopher Ferrall */

/** Pseudonyms for -3, -2, &hellip;. @name Names_for_Integers **/
enum {Zero, One, Two, Three,
Expand Down
23 changes: 12 additions & 11 deletions include/StateVariable.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "DDPShared"
/* This file is part of niqlow. Copyright (C) 2012-2020 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2012-2023 Christopher Ferrall */

/** . elements of array returned by `StateVariable::Transit` @name TransOutput **/
enum {Qind,Qprob,TransOutput}
Expand Down Expand Up @@ -62,7 +62,7 @@ As a transition function:
$$q' = q + I\{s=1\}.$$
As a transition probability:
$$P(q'; q,s) = I\{ q' = q + I\{s=1\} \}.$$
</dd>
**/
class NonRandom : Autonomous { }

Expand Down Expand Up @@ -358,6 +358,7 @@ struct Markov : Random {
<pre>
decl health = new IIDJump("h",<0.1;0.8;0.1>);
</pre>
</dd>
@comments Unlike a general Markov variable, a IIDJump is eligible to be an Exogenous variable, a member of $\epsilon$
added to the model with `DP::ExogenousStates`.
Expand Down Expand Up @@ -468,7 +469,7 @@ Fertility::Mortality() {
decl p = probn(x*q); // x has to be updated using current age and other x values.
decl ivals = CV(i);
return 0 ~ (1-p*ivals) ~ p*ivals;
}</pre>
}</pre></dd>
**/
struct RandomUpDown : Random {
enum { down, hold, up, NRUP}
Expand Down Expand Up @@ -674,7 +675,7 @@ The values of <code>x</code> in $\tau$ (ToTrack)
@example
<pre>
decl wks = new ActionState("wksunemp",work,10,<0>); //track up to 10 years
EndogenousStates(wks);</pre>
EndogenousStates(wks);</pre></dd>
**/
struct StateCounter : Counter {
StateCounter(L,N,Target,ToTrack=<1>,Reset=FALSE,Prune=TRUE);
Expand All @@ -699,10 +700,10 @@ struct StateCounterMaster: StateCounter {
$$s' = s+I\{ CV(x) \in tau\}I\{s \lt N-1\}.$$
@example
<code><pre>
<pre>
decl exper = new ActionCounter("Yrs Experience",10,work); //track up to 10 years working
EndogenousStates(exper);
</pre></code></DD>
</pre></DD>
**/
struct ActionCounter : Counter {
Expand Down Expand Up @@ -769,8 +770,8 @@ This variable requires a target s.X and the lagged value of the target, denoted
<DT>Transition:</DT>
$$s' = I\{ x = Lag(x)\}(s+ I\{s \lt N-1\}).$$
@example
<code><pre>
</pre></code></DD>
<pre>
</pre></DD>
**/
struct Duration : Counter {
const decl Current, Lag, isact, MaxOnce;
Expand All @@ -785,8 +786,8 @@ struct Duration : Counter {
s' = .
</pre></dd>
@example
<code><pre>
</pre></code>
<pre>
</pre></dd>
**/
struct RetainMatch : NonRandom {
const decl matchvalue, acc, replace, keep;
Expand Down Expand Up @@ -837,7 +838,7 @@ Zurcher::Initialize() {
EndogenousState( x = new Renewal("x",90,i,q) );
&vellip;
}
</pre>
</pre></dd>
**/
struct Renewal : Random {
const decl
Expand Down
2 changes: 1 addition & 1 deletion include/TimeInvariant.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "StateVariable"
/* This file is part of niqlow. Copyright (C) 2012-2020 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2012-2023 Christopher Ferrall */

/** Base container for an element of the group vector $\gamma$.
**/
Expand Down
2 changes: 1 addition & 1 deletion include/ValueIteration.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "Bellman"
/* This file is part of niqlow. Copyright (C) 2011-2020 Christopher Ferrall */
/* This file is part of niqlow. Copyright (C) 2011-2023 Christopher Ferrall */

/** stages of Keane-Wolpin approximation @name KWstages **/
enum {AddToSample,ComputeBhat,PredictEV,NKWstages}
Expand Down
6 changes: 3 additions & 3 deletions source/About/Acknowledgements
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<UL>
<LI>Documentation for any code contributed by other people includes an acknowledgement or the person is listed in the OxDoc &amp;author field.</LI>

<LI>Thanks to seminar participants at: Minnesota (2013), Dalhousie (2014), and Melbourne (2016).</LI>
<LI>Thanks to seminar participants at: Minnesota (2013), Dalhousie (2014), Melbourne (2016) and Guelph (2019).</LI>

<LI>Some code and documentation were written while visiting the Department of Economics, UC-Santa Barbara in 2012.</LI>

<LI>Thanks to <a href="www.doornik.com">Jurgen Doornik</a> for creating and maintaining Ox. If there were justice in the world no economist would use Matlab.</LI>

<LI>Thanks to <a href="">Yori Zwols</a> for creating <a href="https://github.com/yozw/oxdoc">OxDoc</a> and responding to my many requests even though he moved on long ago.</LI>
<LI>Thanks to <a href="https://github.com/yozw">Yori Zwols</a> for creating <a href="https://github.com/yozw/oxdoc">OxDoc</a> and responding to my many requests even though he moved on long ago.</LI>

<LI>Thanks to Patrick Day for his early work on this project. His code did not end up in <span class="n">niqlow</span> but it challenged me to follow through on the original approach.</LI>

Expand All @@ -17,6 +17,6 @@
<LI>What's in a name? As usual in dynamic programming, work backwards to find the answer.</LI>
</UL>

@author &copy; 2011-2017 <a href="http://econ.queensu.ca/~ferrall">Christopher Ferrall</a>.
@author &copy; 2011-2023 <a href="http://econ.queensu.ca/~ferrall">Christopher Ferrall</a>.

**/
3 changes: 3 additions & 0 deletions source/About/Install
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
/**
Acquire, Install and Use <span class="n">niqlow</span>.

<h3><a href="https://ferrallc.screencasthost.com/niqlow">Screenshot Guide to Installation.</a></h3>

<ol class="contents">Steps
<LI>Get and install Ox (if necessary)</LI>
<LI>Get <span class="n">niqlow</span></LI>
Expand Down
2 changes: 1 addition & 1 deletion source/About/License
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@

</UL>

@author &copy; 2011-2019 <a href="http://econ.queensu.ca/~ferrall">Christopher Ferrall</a>.
@author &copy; 2011-2023 <a href="http://econ.queensu.ca/~ferrall">Christopher Ferrall</a>.

**/
Loading

0 comments on commit cf81f7f

Please sign in to comment.