proton_api 1.8.0 → 1.9.0

data/lib/proton_api/models/variable_annuity_request.rb

@@ -3,10 +3,10 @@
 
 #Financial engineering module of Hydrogen Atom
 
-OpenAPI spec version: 1.8.0
+OpenAPI spec version: 1.9.0
 Contact: info@hydrogenplatform.com
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.17
+Swagger Codegen version: 2.4.19
 
 =end
 
@@ -14,60 +14,60 @@ require 'date'
 
 module ProtonApi
   class VariableAnnuityRequest
-    attr_accessor :portfolio_id
-
-    attr_accessor :result_type
+    attr_accessor :p
 
-    attr_accessor :inflation_rate
+    attr_accessor :allocation_id
 
-    attr_accessor :remove_outliers
+    attr_accessor :decumulation_horizon
 
-    attr_accessor :deposit_schedule
+    attr_accessor :accumulation_horizon
 
     attr_accessor :annuitization_rate
 
-    attr_accessor :end_date
-
-    attr_accessor :market_data_source
-
-    attr_accessor :tax_rate
+    attr_accessor :guaranteed_rate_benefit
 
-    attr_accessor :p
+    attr_accessor :model_id
 
-    attr_accessor :allocation_id
+    attr_accessor :portfolio_tickers
 
-    attr_accessor :use_proxy_data
+    attr_accessor :create_log
 
-    attr_accessor :start_date
+    attr_accessor :inflation_rate
 
     attr_accessor :aggregation_account_id
 
-    attr_accessor :initial_balance
+    attr_accessor :n
 
-    attr_accessor :create_log
+    attr_accessor :guaranteed_accumulation_benefit
 
-    attr_accessor :decumulation_horizon
+    attr_accessor :end_date
 
-    attr_accessor :account_id
+    attr_accessor :tax_rate
 
-    attr_accessor :accumulation_horizon
+    attr_accessor :start_date
 
-    attr_accessor :trading_days_per_year
+    attr_accessor :remove_outliers
 
     attr_accessor :portfolio_weights
 
-    attr_accessor :guaranteed_accumulation_benefit
+    attr_accessor :portfolio_id
 
-    attr_accessor :portfolio_tickers
+    attr_accessor :result_type
 
-    attr_accessor :guaranteed_rate_benefit
+    attr_accessor :account_id
 
-    attr_accessor :model_id
+    attr_accessor :trading_days_per_year
 
-    attr_accessor :n
+    attr_accessor :use_proxy_data
+
+    attr_accessor :initial_balance
+
+    attr_accessor :market_data_source
 
     attr_accessor :frequency_interval
 
+    attr_accessor :deposit_schedule
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -93,66 +93,66 @@ module ProtonApi
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'portfolio_id' => :'portfolio_id',
-        :'result_type' => :'result_type',
-        :'inflation_rate' => :'inflation_rate',
-        :'remove_outliers' => :'remove_outliers',
-        :'deposit_schedule' => :'deposit_schedule',
-        :'annuitization_rate' => :'annuitization_rate',
-        :'end_date' => :'end_date',
-        :'market_data_source' => :'market_data_source',
-        :'tax_rate' => :'tax_rate',
         :'p' => :'p',
         :'allocation_id' => :'allocation_id',
-        :'use_proxy_data' => :'use_proxy_data',
-        :'start_date' => :'start_date',
-        :'aggregation_account_id' => :'aggregation_account_id',
-        :'initial_balance' => :'initial_balance',
-        :'create_log' => :'create_log',
         :'decumulation_horizon' => :'decumulation_horizon',
-        :'account_id' => :'account_id',
         :'accumulation_horizon' => :'accumulation_horizon',
-        :'trading_days_per_year' => :'trading_days_per_year',
-        :'portfolio_weights' => :'portfolio_weights',
-        :'guaranteed_accumulation_benefit' => :'guaranteed_accumulation_benefit',
-        :'portfolio_tickers' => :'portfolio_tickers',
+        :'annuitization_rate' => :'annuitization_rate',
         :'guaranteed_rate_benefit' => :'guaranteed_rate_benefit',
         :'model_id' => :'model_id',
+        :'portfolio_tickers' => :'portfolio_tickers',
+        :'create_log' => :'create_log',
+        :'inflation_rate' => :'inflation_rate',
+        :'aggregation_account_id' => :'aggregation_account_id',
         :'n' => :'n',
-        :'frequency_interval' => :'frequency_interval'
+        :'guaranteed_accumulation_benefit' => :'guaranteed_accumulation_benefit',
+        :'end_date' => :'end_date',
+        :'tax_rate' => :'tax_rate',
+        :'start_date' => :'start_date',
+        :'remove_outliers' => :'remove_outliers',
+        :'portfolio_weights' => :'portfolio_weights',
+        :'portfolio_id' => :'portfolio_id',
+        :'result_type' => :'result_type',
+        :'account_id' => :'account_id',
+        :'trading_days_per_year' => :'trading_days_per_year',
+        :'use_proxy_data' => :'use_proxy_data',
+        :'initial_balance' => :'initial_balance',
+        :'market_data_source' => :'market_data_source',
+        :'frequency_interval' => :'frequency_interval',
+        :'deposit_schedule' => :'deposit_schedule'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'portfolio_id' => :'String',
-        :'result_type' => :'String',
-        :'inflation_rate' => :'Float',
-        :'remove_outliers' => :'BOOLEAN',
-        :'deposit_schedule' => :'AnnuityDepositSchedule',
-        :'annuitization_rate' => :'Float',
-        :'end_date' => :'String',
-        :'market_data_source' => :'String',
-        :'tax_rate' => :'Float',
         :'p' => :'Float',
         :'allocation_id' => :'String',
-        :'use_proxy_data' => :'BOOLEAN',
-        :'start_date' => :'String',
-        :'aggregation_account_id' => :'String',
-        :'initial_balance' => :'Float',
-        :'create_log' => :'BOOLEAN',
         :'decumulation_horizon' => :'Integer',
-        :'account_id' => :'String',
         :'accumulation_horizon' => :'Integer',
-        :'trading_days_per_year' => :'Integer',
-        :'portfolio_weights' => :'Array<Float>',
-        :'guaranteed_accumulation_benefit' => :'Float',
-        :'portfolio_tickers' => :'Array<String>',
+        :'annuitization_rate' => :'Float',
         :'guaranteed_rate_benefit' => :'Array<GuaranteedRateBenefit>',
         :'model_id' => :'String',
+        :'portfolio_tickers' => :'Array<String>',
+        :'create_log' => :'BOOLEAN',
+        :'inflation_rate' => :'Float',
+        :'aggregation_account_id' => :'String',
         :'n' => :'Integer',
-        :'frequency_interval' => :'String'
+        :'guaranteed_accumulation_benefit' => :'Float',
+        :'end_date' => :'String',
+        :'tax_rate' => :'Float',
+        :'start_date' => :'String',
+        :'remove_outliers' => :'BOOLEAN',
+        :'portfolio_weights' => :'Array<Float>',
+        :'portfolio_id' => :'String',
+        :'result_type' => :'String',
+        :'account_id' => :'String',
+        :'trading_days_per_year' => :'Integer',
+        :'use_proxy_data' => :'BOOLEAN',
+        :'initial_balance' => :'Float',
+        :'market_data_source' => :'String',
+        :'frequency_interval' => :'String',
+        :'deposit_schedule' => :'AnnuityDepositSchedule'
       }
     end
 
@@ -164,30 +164,20 @@ module ProtonApi
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
-      if attributes.has_key?(:'portfolio_id')
-        self.portfolio_id = attributes[:'portfolio_id']
-      end
-
-      if attributes.has_key?(:'result_type')
-        self.result_type = attributes[:'result_type']
-      else
-        self.result_type = 'median'
+      if attributes.has_key?(:'p')
+        self.p = attributes[:'p']
       end
 
-      if attributes.has_key?(:'inflation_rate')
-        self.inflation_rate = attributes[:'inflation_rate']
-      else
-        self.inflation_rate = 0.0
+      if attributes.has_key?(:'allocation_id')
+        self.allocation_id = attributes[:'allocation_id']
       end
 
-      if attributes.has_key?(:'remove_outliers')
-        self.remove_outliers = attributes[:'remove_outliers']
-      else
-        self.remove_outliers = false
+      if attributes.has_key?(:'decumulation_horizon')
+        self.decumulation_horizon = attributes[:'decumulation_horizon']
       end
 
-      if attributes.has_key?(:'deposit_schedule')
-        self.deposit_schedule = attributes[:'deposit_schedule']
+      if attributes.has_key?(:'accumulation_horizon')
+        self.accumulation_horizon = attributes[:'accumulation_horizon']
       end
 
       if attributes.has_key?(:'annuitization_rate')
@@ -196,72 +186,68 @@ module ProtonApi
         self.annuitization_rate = 0.0
       end
 
-      if attributes.has_key?(:'end_date')
-        self.end_date = attributes[:'end_date']
-      end
-
-      if attributes.has_key?(:'market_data_source')
-        self.market_data_source = attributes[:'market_data_source']
-      else
-        self.market_data_source = 'nucleus'
-      end
-
-      if attributes.has_key?(:'tax_rate')
-        self.tax_rate = attributes[:'tax_rate']
-      else
-        self.tax_rate = 0.0
+      if attributes.has_key?(:'guaranteed_rate_benefit')
+        if (value = attributes[:'guaranteed_rate_benefit']).is_a?(Array)
+          self.guaranteed_rate_benefit = value
+        end
       end
 
-      if attributes.has_key?(:'p')
-        self.p = attributes[:'p']
+      if attributes.has_key?(:'model_id')
+        self.model_id = attributes[:'model_id']
       end
 
-      if attributes.has_key?(:'allocation_id')
-        self.allocation_id = attributes[:'allocation_id']
+      if attributes.has_key?(:'portfolio_tickers')
+        if (value = attributes[:'portfolio_tickers']).is_a?(Array)
+          self.portfolio_tickers = value
+        end
       end
 
-      if attributes.has_key?(:'use_proxy_data')
-        self.use_proxy_data = attributes[:'use_proxy_data']
+      if attributes.has_key?(:'create_log')
+        self.create_log = attributes[:'create_log']
       else
-        self.use_proxy_data = false
+        self.create_log = false
       end
 
-      if attributes.has_key?(:'start_date')
-        self.start_date = attributes[:'start_date']
+      if attributes.has_key?(:'inflation_rate')
+        self.inflation_rate = attributes[:'inflation_rate']
+      else
+        self.inflation_rate = 0.0
       end
 
       if attributes.has_key?(:'aggregation_account_id')
         self.aggregation_account_id = attributes[:'aggregation_account_id']
       end
 
-      if attributes.has_key?(:'initial_balance')
-        self.initial_balance = attributes[:'initial_balance']
+      if attributes.has_key?(:'n')
+        self.n = attributes[:'n']
       else
-        self.initial_balance = 0.0
+        self.n = 1000
       end
 
-      if attributes.has_key?(:'create_log')
-        self.create_log = attributes[:'create_log']
+      if attributes.has_key?(:'guaranteed_accumulation_benefit')
+        self.guaranteed_accumulation_benefit = attributes[:'guaranteed_accumulation_benefit']
       else
-        self.create_log = false
+        self.guaranteed_accumulation_benefit = 0.0
       end
 
-      if attributes.has_key?(:'decumulation_horizon')
-        self.decumulation_horizon = attributes[:'decumulation_horizon']
+      if attributes.has_key?(:'end_date')
+        self.end_date = attributes[:'end_date']
       end
 
-      if attributes.has_key?(:'account_id')
-        self.account_id = attributes[:'account_id']
+      if attributes.has_key?(:'tax_rate')
+        self.tax_rate = attributes[:'tax_rate']
+      else
+        self.tax_rate = 0.0
       end
 
-      if attributes.has_key?(:'accumulation_horizon')
-        self.accumulation_horizon = attributes[:'accumulation_horizon']
+      if attributes.has_key?(:'start_date')
+        self.start_date = attributes[:'start_date']
       end
 
-      if attributes.has_key?(:'trading_days_per_year')
-        self.trading_days_per_year = attributes[:'trading_days_per_year']
+      if attributes.has_key?(:'remove_outliers')
+        self.remove_outliers = attributes[:'remove_outliers']
       else
-        self.trading_days_per_year = 252
+        self.remove_outliers = false
       end
 
       if attributes.has_key?(:'portfolio_weights')
@@ -270,65 +256,59 @@ module ProtonApi
         end
       end
 
-      if attributes.has_key?(:'guaranteed_accumulation_benefit')
-        self.guaranteed_accumulation_benefit = attributes[:'guaranteed_accumulation_benefit']
-      else
-        self.guaranteed_accumulation_benefit = 0.0
-      end
-
-      if attributes.has_key?(:'portfolio_tickers')
-        if (value = attributes[:'portfolio_tickers']).is_a?(Array)
-          self.portfolio_tickers = value
-        end
+      if attributes.has_key?(:'portfolio_id')
+        self.portfolio_id = attributes[:'portfolio_id']
       end
 
-      if attributes.has_key?(:'guaranteed_rate_benefit')
-        if (value = attributes[:'guaranteed_rate_benefit']).is_a?(Array)
-          self.guaranteed_rate_benefit = value
-        end
+      if attributes.has_key?(:'result_type')
+        self.result_type = attributes[:'result_type']
+      else
+        self.result_type = 'median'
       end
 
-      if attributes.has_key?(:'model_id')
-        self.model_id = attributes[:'model_id']
+      if attributes.has_key?(:'account_id')
+        self.account_id = attributes[:'account_id']
       end
 
-      if attributes.has_key?(:'n')
-        self.n = attributes[:'n']
+      if attributes.has_key?(:'trading_days_per_year')
+        self.trading_days_per_year = attributes[:'trading_days_per_year']
       else
-        self.n = 1000
+        self.trading_days_per_year = 252
       end
 
-      if attributes.has_key?(:'frequency_interval')
-        self.frequency_interval = attributes[:'frequency_interval']
+      if attributes.has_key?(:'use_proxy_data')
+        self.use_proxy_data = attributes[:'use_proxy_data']
       else
-        self.frequency_interval = 'year'
-      end
-    end
-
-    # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properties with the reasons
-    def list_invalid_properties
-      invalid_properties = Array.new
-      if !@inflation_rate.nil? && @inflation_rate > 20
-        invalid_properties.push('invalid value for "inflation_rate", must be smaller than or equal to 20.')
+        self.use_proxy_data = false
       end
 
-      if !@inflation_rate.nil? && @inflation_rate < -1
-        invalid_properties.push('invalid value for "inflation_rate", must be greater than or equal to -1.')
+      if attributes.has_key?(:'initial_balance')
+        self.initial_balance = attributes[:'initial_balance']
+      else
+        self.initial_balance = 0.0
       end
 
-      if !@annuitization_rate.nil? && @annuitization_rate < -1
-        invalid_properties.push('invalid value for "annuitization_rate", must be greater than or equal to -1.')
+      if attributes.has_key?(:'market_data_source')
+        self.market_data_source = attributes[:'market_data_source']
+      else
+        self.market_data_source = 'nucleus'
       end
 
-      if !@tax_rate.nil? && @tax_rate > 1
-        invalid_properties.push('invalid value for "tax_rate", must be smaller than or equal to 1.')
+      if attributes.has_key?(:'frequency_interval')
+        self.frequency_interval = attributes[:'frequency_interval']
+      else
+        self.frequency_interval = 'year'
       end
 
-      if !@tax_rate.nil? && @tax_rate < 0
-        invalid_properties.push('invalid value for "tax_rate", must be greater than or equal to 0.')
+      if attributes.has_key?(:'deposit_schedule')
+        self.deposit_schedule = attributes[:'deposit_schedule']
       end
+    end
 
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properties with the reasons
+    def list_invalid_properties
+      invalid_properties = Array.new
       if !@p.nil? && @p > 100
         invalid_properties.push('invalid value for "p", must be smaller than or equal to 100.')
       end
@@ -337,10 +317,6 @@ module ProtonApi
         invalid_properties.push('invalid value for "p", must be greater than or equal to 0.')
       end
 
-      if !@initial_balance.nil? && @initial_balance < 0
-        invalid_properties.push('invalid value for "initial_balance", must be greater than or equal to 0.')
-      end
-
       if @decumulation_horizon.nil?
         invalid_properties.push('invalid value for "decumulation_horizon", decumulation_horizon cannot be nil.')
       end
@@ -357,70 +333,112 @@ module ProtonApi
         invalid_properties.push('invalid value for "accumulation_horizon", must be greater than or equal to 0.')
       end
 
-      if !@trading_days_per_year.nil? && @trading_days_per_year < 1
-        invalid_properties.push('invalid value for "trading_days_per_year", must be greater than or equal to 1.')
+      if !@annuitization_rate.nil? && @annuitization_rate < -1
+        invalid_properties.push('invalid value for "annuitization_rate", must be greater than or equal to -1.')
       end
 
-      if !@guaranteed_accumulation_benefit.nil? && @guaranteed_accumulation_benefit < 0
-        invalid_properties.push('invalid value for "guaranteed_accumulation_benefit", must be greater than or equal to 0.')
+      if !@inflation_rate.nil? && @inflation_rate > 20
+        invalid_properties.push('invalid value for "inflation_rate", must be smaller than or equal to 20.')
+      end
+
+      if !@inflation_rate.nil? && @inflation_rate < -1
+        invalid_properties.push('invalid value for "inflation_rate", must be greater than or equal to -1.')
       end
 
       if !@n.nil? && @n < 1
         invalid_properties.push('invalid value for "n", must be greater than or equal to 1.')
       end
 
+      if !@guaranteed_accumulation_benefit.nil? && @guaranteed_accumulation_benefit < 0
+        invalid_properties.push('invalid value for "guaranteed_accumulation_benefit", must be greater than or equal to 0.')
+      end
+
+      if !@tax_rate.nil? && @tax_rate > 1
+        invalid_properties.push('invalid value for "tax_rate", must be smaller than or equal to 1.')
+      end
+
+      if !@tax_rate.nil? && @tax_rate < 0
+        invalid_properties.push('invalid value for "tax_rate", must be greater than or equal to 0.')
+      end
+
+      if !@trading_days_per_year.nil? && @trading_days_per_year < 1
+        invalid_properties.push('invalid value for "trading_days_per_year", must be greater than or equal to 1.')
+      end
+
+      if !@initial_balance.nil? && @initial_balance < 0
+        invalid_properties.push('invalid value for "initial_balance", must be greater than or equal to 0.')
+      end
+
       invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      result_type_validator = EnumAttributeValidator.new('String', ['mean', 'median', 'custom'])
-      return false unless result_type_validator.valid?(@result_type)
-      return false if !@inflation_rate.nil? && @inflation_rate > 20
-      return false if !@inflation_rate.nil? && @inflation_rate < -1
-      return false if !@annuitization_rate.nil? && @annuitization_rate < -1
-      market_data_source_validator = EnumAttributeValidator.new('String', ['nucleus', 'integration'])
-      return false unless market_data_source_validator.valid?(@market_data_source)
-      return false if !@tax_rate.nil? && @tax_rate > 1
-      return false if !@tax_rate.nil? && @tax_rate < 0
       return false if !@p.nil? && @p > 100
       return false if !@p.nil? && @p < 0
-      return false if !@initial_balance.nil? && @initial_balance < 0
       return false if @decumulation_horizon.nil?
       return false if @decumulation_horizon < 1
       return false if @accumulation_horizon.nil?
       return false if @accumulation_horizon < 0
-      return false if !@trading_days_per_year.nil? && @trading_days_per_year < 1
-      return false if !@guaranteed_accumulation_benefit.nil? && @guaranteed_accumulation_benefit < 0
+      return false if !@annuitization_rate.nil? && @annuitization_rate < -1
+      return false if !@inflation_rate.nil? && @inflation_rate > 20
+      return false if !@inflation_rate.nil? && @inflation_rate < -1
       return false if !@n.nil? && @n < 1
+      return false if !@guaranteed_accumulation_benefit.nil? && @guaranteed_accumulation_benefit < 0
+      return false if !@tax_rate.nil? && @tax_rate > 1
+      return false if !@tax_rate.nil? && @tax_rate < 0
+      result_type_validator = EnumAttributeValidator.new('String', ['mean', 'median', 'custom'])
+      return false unless result_type_validator.valid?(@result_type)
+      return false if !@trading_days_per_year.nil? && @trading_days_per_year < 1
+      return false if !@initial_balance.nil? && @initial_balance < 0
+      market_data_source_validator = EnumAttributeValidator.new('String', ['nucleus', 'integration'])
+      return false unless market_data_source_validator.valid?(@market_data_source)
       frequency_interval_validator = EnumAttributeValidator.new('String', ['year', 'quarter', 'month', 'week', 'day'])
       return false unless frequency_interval_validator.valid?(@frequency_interval)
       true
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] result_type Object to be assigned
-    def result_type=(result_type)
-      validator = EnumAttributeValidator.new('String', ['mean', 'median', 'custom'])
-      unless validator.valid?(result_type)
-        fail ArgumentError, 'invalid value for "result_type", must be one of #{validator.allowable_values}.'
+    # Custom attribute writer method with validation
+    # @param [Object] p Value to be assigned
+    def p=(p)
+      if !p.nil? && p > 100
+        fail ArgumentError, 'invalid value for "p", must be smaller than or equal to 100.'
       end
-      @result_type = result_type
+
+      if !p.nil? && p < 0
+        fail ArgumentError, 'invalid value for "p", must be greater than or equal to 0.'
+      end
+
+      @p = p
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] inflation_rate Value to be assigned
-    def inflation_rate=(inflation_rate)
-      if !inflation_rate.nil? && inflation_rate > 20
-        fail ArgumentError, 'invalid value for "inflation_rate", must be smaller than or equal to 20.'
+    # @param [Object] decumulation_horizon Value to be assigned
+    def decumulation_horizon=(decumulation_horizon)
+      if decumulation_horizon.nil?
+        fail ArgumentError, 'decumulation_horizon cannot be nil'
       end
 
-      if !inflation_rate.nil? && inflation_rate < -1
-        fail ArgumentError, 'invalid value for "inflation_rate", must be greater than or equal to -1.'
+      if decumulation_horizon < 1
+        fail ArgumentError, 'invalid value for "decumulation_horizon", must be greater than or equal to 1.'
       end
 
-      @inflation_rate = inflation_rate
+      @decumulation_horizon = decumulation_horizon
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] accumulation_horizon Value to be assigned
+    def accumulation_horizon=(accumulation_horizon)
+      if accumulation_horizon.nil?
+        fail ArgumentError, 'accumulation_horizon cannot be nil'
+      end
+
+      if accumulation_horizon < 0
+        fail ArgumentError, 'invalid value for "accumulation_horizon", must be greater than or equal to 0.'
+      end
+
+      @accumulation_horizon = accumulation_horizon
     end
 
     # Custom attribute writer method with validation
@@ -433,80 +451,62 @@ module ProtonApi
       @annuitization_rate = annuitization_rate
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] market_data_source Object to be assigned
-    def market_data_source=(market_data_source)
-      validator = EnumAttributeValidator.new('String', ['nucleus', 'integration'])
-      unless validator.valid?(market_data_source)
-        fail ArgumentError, 'invalid value for "market_data_source", must be one of #{validator.allowable_values}.'
-      end
-      @market_data_source = market_data_source
-    end
-
     # Custom attribute writer method with validation
-    # @param [Object] tax_rate Value to be assigned
-    def tax_rate=(tax_rate)
-      if !tax_rate.nil? && tax_rate > 1
-        fail ArgumentError, 'invalid value for "tax_rate", must be smaller than or equal to 1.'
+    # @param [Object] inflation_rate Value to be assigned
+    def inflation_rate=(inflation_rate)
+      if !inflation_rate.nil? && inflation_rate > 20
+        fail ArgumentError, 'invalid value for "inflation_rate", must be smaller than or equal to 20.'
       end
 
-      if !tax_rate.nil? && tax_rate < 0
-        fail ArgumentError, 'invalid value for "tax_rate", must be greater than or equal to 0.'
+      if !inflation_rate.nil? && inflation_rate < -1
+        fail ArgumentError, 'invalid value for "inflation_rate", must be greater than or equal to -1.'
       end
 
-      @tax_rate = tax_rate
+      @inflation_rate = inflation_rate
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] p Value to be assigned
-    def p=(p)
-      if !p.nil? && p > 100
-        fail ArgumentError, 'invalid value for "p", must be smaller than or equal to 100.'
-      end
-
-      if !p.nil? && p < 0
-        fail ArgumentError, 'invalid value for "p", must be greater than or equal to 0.'
+    # @param [Object] n Value to be assigned
+    def n=(n)
+      if !n.nil? && n < 1
+        fail ArgumentError, 'invalid value for "n", must be greater than or equal to 1.'
       end
 
-      @p = p
+      @n = n
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] initial_balance Value to be assigned
-    def initial_balance=(initial_balance)
-      if !initial_balance.nil? && initial_balance < 0
-        fail ArgumentError, 'invalid value for "initial_balance", must be greater than or equal to 0.'
+    # @param [Object] guaranteed_accumulation_benefit Value to be assigned
+    def guaranteed_accumulation_benefit=(guaranteed_accumulation_benefit)
+      if !guaranteed_accumulation_benefit.nil? && guaranteed_accumulation_benefit < 0
+        fail ArgumentError, 'invalid value for "guaranteed_accumulation_benefit", must be greater than or equal to 0.'
       end
 
-      @initial_balance = initial_balance
+      @guaranteed_accumulation_benefit = guaranteed_accumulation_benefit
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] decumulation_horizon Value to be assigned
-    def decumulation_horizon=(decumulation_horizon)
-      if decumulation_horizon.nil?
-        fail ArgumentError, 'decumulation_horizon cannot be nil'
+    # @param [Object] tax_rate Value to be assigned
+    def tax_rate=(tax_rate)
+      if !tax_rate.nil? && tax_rate > 1
+        fail ArgumentError, 'invalid value for "tax_rate", must be smaller than or equal to 1.'
       end
 
-      if decumulation_horizon < 1
-        fail ArgumentError, 'invalid value for "decumulation_horizon", must be greater than or equal to 1.'
+      if !tax_rate.nil? && tax_rate < 0
+        fail ArgumentError, 'invalid value for "tax_rate", must be greater than or equal to 0.'
       end
 
-      @decumulation_horizon = decumulation_horizon
+      @tax_rate = tax_rate
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] accumulation_horizon Value to be assigned
-    def accumulation_horizon=(accumulation_horizon)
-      if accumulation_horizon.nil?
-        fail ArgumentError, 'accumulation_horizon cannot be nil'
-      end
-
-      if accumulation_horizon < 0
-        fail ArgumentError, 'invalid value for "accumulation_horizon", must be greater than or equal to 0.'
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] result_type Object to be assigned
+    def result_type=(result_type)
+      validator = EnumAttributeValidator.new('String', ['mean', 'median', 'custom'])
+      unless validator.valid?(result_type)
+        fail ArgumentError, 'invalid value for "result_type", must be one of #{validator.allowable_values}.'
       end
-
-      @accumulation_horizon = accumulation_horizon
+      @result_type = result_type
     end
 
     # Custom attribute writer method with validation
@@ -520,23 +520,23 @@ module ProtonApi
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] guaranteed_accumulation_benefit Value to be assigned
-    def guaranteed_accumulation_benefit=(guaranteed_accumulation_benefit)
-      if !guaranteed_accumulation_benefit.nil? && guaranteed_accumulation_benefit < 0
-        fail ArgumentError, 'invalid value for "guaranteed_accumulation_benefit", must be greater than or equal to 0.'
+    # @param [Object] initial_balance Value to be assigned
+    def initial_balance=(initial_balance)
+      if !initial_balance.nil? && initial_balance < 0
+        fail ArgumentError, 'invalid value for "initial_balance", must be greater than or equal to 0.'
       end
 
-      @guaranteed_accumulation_benefit = guaranteed_accumulation_benefit
+      @initial_balance = initial_balance
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] n Value to be assigned
-    def n=(n)
-      if !n.nil? && n < 1
-        fail ArgumentError, 'invalid value for "n", must be greater than or equal to 1.'
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] market_data_source Object to be assigned
+    def market_data_source=(market_data_source)
+      validator = EnumAttributeValidator.new('String', ['nucleus', 'integration'])
+      unless validator.valid?(market_data_source)
+        fail ArgumentError, 'invalid value for "market_data_source", must be one of #{validator.allowable_values}.'
       end
-
-      @n = n
+      @market_data_source = market_data_source
     end
 
     # Custom attribute writer method checking allowed values (enum).
@@ -554,33 +554,33 @@ module ProtonApi
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          portfolio_id == o.portfolio_id &&
-          result_type == o.result_type &&
-          inflation_rate == o.inflation_rate &&
-          remove_outliers == o.remove_outliers &&
-          deposit_schedule == o.deposit_schedule &&
-          annuitization_rate == o.annuitization_rate &&
-          end_date == o.end_date &&
-          market_data_source == o.market_data_source &&
-          tax_rate == o.tax_rate &&
           p == o.p &&
           allocation_id == o.allocation_id &&
-          use_proxy_data == o.use_proxy_data &&
-          start_date == o.start_date &&
-          aggregation_account_id == o.aggregation_account_id &&
-          initial_balance == o.initial_balance &&
-          create_log == o.create_log &&
           decumulation_horizon == o.decumulation_horizon &&
-          account_id == o.account_id &&
           accumulation_horizon == o.accumulation_horizon &&
-          trading_days_per_year == o.trading_days_per_year &&
-          portfolio_weights == o.portfolio_weights &&
-          guaranteed_accumulation_benefit == o.guaranteed_accumulation_benefit &&
-          portfolio_tickers == o.portfolio_tickers &&
+          annuitization_rate == o.annuitization_rate &&
           guaranteed_rate_benefit == o.guaranteed_rate_benefit &&
           model_id == o.model_id &&
+          portfolio_tickers == o.portfolio_tickers &&
+          create_log == o.create_log &&
+          inflation_rate == o.inflation_rate &&
+          aggregation_account_id == o.aggregation_account_id &&
           n == o.n &&
-          frequency_interval == o.frequency_interval
+          guaranteed_accumulation_benefit == o.guaranteed_accumulation_benefit &&
+          end_date == o.end_date &&
+          tax_rate == o.tax_rate &&
+          start_date == o.start_date &&
+          remove_outliers == o.remove_outliers &&
+          portfolio_weights == o.portfolio_weights &&
+          portfolio_id == o.portfolio_id &&
+          result_type == o.result_type &&
+          account_id == o.account_id &&
+          trading_days_per_year == o.trading_days_per_year &&
+          use_proxy_data == o.use_proxy_data &&
+          initial_balance == o.initial_balance &&
+          market_data_source == o.market_data_source &&
+          frequency_interval == o.frequency_interval &&
+          deposit_schedule == o.deposit_schedule
     end
 
     # @see the `==` method
@@ -592,7 +592,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [portfolio_id, result_type, inflation_rate, remove_outliers, deposit_schedule, annuitization_rate, end_date, market_data_source, tax_rate, p, allocation_id, use_proxy_data, start_date, aggregation_account_id, initial_balance, create_log, decumulation_horizon, account_id, accumulation_horizon, trading_days_per_year, portfolio_weights, guaranteed_accumulation_benefit, portfolio_tickers, guaranteed_rate_benefit, model_id, n, frequency_interval].hash
+      [p, allocation_id, decumulation_horizon, accumulation_horizon, annuitization_rate, guaranteed_rate_benefit, model_id, portfolio_tickers, create_log, inflation_rate, aggregation_account_id, n, guaranteed_accumulation_benefit, end_date, tax_rate, start_date, remove_outliers, portfolio_weights, portfolio_id, result_type, account_id, trading_days_per_year, use_proxy_data, initial_balance, market_data_source, frequency_interval, deposit_schedule].hash
     end
 
     # Builds the object from hash
@@ -614,17 +614,16 @@ module ProtonApi
 
       self
     end
-
-    # Deserializes the data based on type
+# Deserializes the data based on type
     # @param string type Data type
     # @param string value Value to be deserialized
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
       when :DateTime
-        DateTime.parse(value)
+        value
       when :Date
-        Date.parse(value)
+        value
       when :String
         value.to_s
       when :Integer
@@ -656,8 +655,7 @@ module ProtonApi
         temp_model.build_from_hash(value)
       end
     end
-
-    # Returns the string representation of the object
+# Returns the string representation of the object
     # @return [String] String presentation of the object
     def to_s
       to_hash.to_s
@@ -680,8 +678,7 @@ module ProtonApi
       end
       hash
     end
-
-    # Outputs non-array value in the form of hash
+# Outputs non-array value in the form of hash
     # For object, use to_hash. Otherwise, just return the value
     # @param [Object] value Any valid value
     # @return [Hash] Returns the value in the form of hash