Skip to content

Commit

Permalink
removed dead getDiscountRate property
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben Vincent committed Feb 16, 2017
1 parent c33c75a commit 8f6da7d
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 21 deletions.
1 change: 0 additions & 1 deletion ddToolbox/models/nonparametric_models/NonParametric.m
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

properties (Access = private)
AUC_DATA
getDiscountRate % function handle
end

methods (Access = public)
Expand Down
5 changes: 1 addition & 4 deletions ddToolbox/models/parametric_models/Parametric.m
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
classdef (Abstract) Parametric < Model

properties (Access = private)

end

methods (Access = public)

function obj = Parametric(data, varargin)
Expand Down Expand Up @@ -132,6 +128,7 @@ function plot_discount_functions_in_grid(obj)

methods (Access = private)

% TODO: this should be moved to CODA
function plotAllTriPlots(obj, plotOptions, modelFilename)

pVariableNames = obj.varList.participantLevel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
classdef (Abstract) ExponentialPower < Parametric

properties (Access = private)
getDiscountRate % function handle
end

methods (Access = public)

function obj = ExponentialPower(data, varargin)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
classdef (Abstract) Exponential1 < Parametric

properties (Access = private)
getDiscountRate % function handle
end

methods (Access = public)

function obj = Exponential1(data, varargin)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
classdef (Abstract) Hyperbolic1MagEffect < Parametric
%Hyperbolic1MagEffect Hyperbolic1MagEffect is a subclass of Model for examining the 1-parameter hyperbolic discounting function.

properties (Access = private)
getDiscountRate % function handle
end

methods (Access = public)

function obj = Hyperbolic1MagEffect(data, varargin)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
classdef (Abstract) Hyperbolic1 < Parametric
%Hyperbolic1 Hyperbolic1 is a subclass of Model for examining the 1-parameter hyperbolic discounting function.

properties (Access = private)
getDiscountRate % function handle
end

methods (Access = public)

function obj = Hyperbolic1(data, varargin)
Expand Down

0 comments on commit 8f6da7d

Please sign in to comment.