diff --git a/ddToolbox/models/nonparametric_models/NonParametric.m b/ddToolbox/models/nonparametric_models/NonParametric.m index b8f864f4..e2a835ba 100644 --- a/ddToolbox/models/nonparametric_models/NonParametric.m +++ b/ddToolbox/models/nonparametric_models/NonParametric.m @@ -3,7 +3,6 @@ properties (Access = private) AUC_DATA - getDiscountRate % function handle end methods (Access = public) diff --git a/ddToolbox/models/parametric_models/Parametric.m b/ddToolbox/models/parametric_models/Parametric.m index 2700bf0e..9de3ff97 100644 --- a/ddToolbox/models/parametric_models/Parametric.m +++ b/ddToolbox/models/parametric_models/Parametric.m @@ -1,9 +1,5 @@ classdef (Abstract) Parametric < Model - - properties (Access = private) - end - methods (Access = public) function obj = Parametric(data, varargin) @@ -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; diff --git a/ddToolbox/models/parametric_models/bens_new_model/ExponentialPower.m b/ddToolbox/models/parametric_models/bens_new_model/ExponentialPower.m index 50a97c46..29f1e6f5 100644 --- a/ddToolbox/models/parametric_models/bens_new_model/ExponentialPower.m +++ b/ddToolbox/models/parametric_models/bens_new_model/ExponentialPower.m @@ -1,9 +1,5 @@ classdef (Abstract) ExponentialPower < Parametric - properties (Access = private) - getDiscountRate % function handle - end - methods (Access = public) function obj = ExponentialPower(data, varargin) diff --git a/ddToolbox/models/parametric_models/exponential_models/Exponential1.m b/ddToolbox/models/parametric_models/exponential_models/Exponential1.m index 1252f5ec..6758b7dd 100644 --- a/ddToolbox/models/parametric_models/exponential_models/Exponential1.m +++ b/ddToolbox/models/parametric_models/exponential_models/Exponential1.m @@ -1,9 +1,5 @@ classdef (Abstract) Exponential1 < Parametric - properties (Access = private) - getDiscountRate % function handle - end - methods (Access = public) function obj = Exponential1(data, varargin) diff --git a/ddToolbox/models/parametric_models/hyperbolic_magnitude_effect_models/Hyperbolic1MagEffect.m b/ddToolbox/models/parametric_models/hyperbolic_magnitude_effect_models/Hyperbolic1MagEffect.m index 0525ede2..c4a0b225 100644 --- a/ddToolbox/models/parametric_models/hyperbolic_magnitude_effect_models/Hyperbolic1MagEffect.m +++ b/ddToolbox/models/parametric_models/hyperbolic_magnitude_effect_models/Hyperbolic1MagEffect.m @@ -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) diff --git a/ddToolbox/models/parametric_models/hyperbolic_models/Hyperbolic1.m b/ddToolbox/models/parametric_models/hyperbolic_models/Hyperbolic1.m index c2c08f25..d95ac78b 100644 --- a/ddToolbox/models/parametric_models/hyperbolic_models/Hyperbolic1.m +++ b/ddToolbox/models/parametric_models/hyperbolic_models/Hyperbolic1.m @@ -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)