proton_api 1.8.0 → 1.9.0

data/lib/proton_api/models/goal_config.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,23 +14,23 @@ require 'date'
 
 module ProtonApi
   class GoalConfig
-    attr_accessor :goal_inflation
-
     attr_accessor :goal_amount
 
+    attr_accessor :goal_inflation
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'goal_inflation' => :'goal_inflation',
-        :'goal_amount' => :'goal_amount'
+        :'goal_amount' => :'goal_amount',
+        :'goal_inflation' => :'goal_inflation'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'goal_inflation' => :'Float',
-        :'goal_amount' => :'Float'
+        :'goal_amount' => :'Float',
+        :'goal_inflation' => :'Float'
       }
     end
 
@@ -42,50 +42,40 @@ 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?(:'goal_amount')
+        self.goal_amount = attributes[:'goal_amount']
+      end
+
       if attributes.has_key?(:'goal_inflation')
         self.goal_inflation = attributes[:'goal_inflation']
       else
         self.goal_inflation = 0.0
       end
-
-      if attributes.has_key?(:'goal_amount')
-        self.goal_amount = attributes[:'goal_amount']
-      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 !@goal_inflation.nil? && @goal_inflation < -1
-        invalid_properties.push('invalid value for "goal_inflation", must be greater than or equal to -1.')
-      end
-
       if !@goal_amount.nil? && @goal_amount < 0
         invalid_properties.push('invalid value for "goal_amount", must be greater than or equal to 0.')
       end
 
+      if !@goal_inflation.nil? && @goal_inflation < -1
+        invalid_properties.push('invalid value for "goal_inflation", must be greater than or equal to -1.')
+      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?
-      return false if !@goal_inflation.nil? && @goal_inflation < -1
       return false if !@goal_amount.nil? && @goal_amount < 0
+      return false if !@goal_inflation.nil? && @goal_inflation < -1
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] goal_inflation Value to be assigned
-    def goal_inflation=(goal_inflation)
-      if !goal_inflation.nil? && goal_inflation < -1
-        fail ArgumentError, 'invalid value for "goal_inflation", must be greater than or equal to -1.'
-      end
-
-      @goal_inflation = goal_inflation
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] goal_amount Value to be assigned
     def goal_amount=(goal_amount)
@@ -96,13 +86,23 @@ module ProtonApi
       @goal_amount = goal_amount
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] goal_inflation Value to be assigned
+    def goal_inflation=(goal_inflation)
+      if !goal_inflation.nil? && goal_inflation < -1
+        fail ArgumentError, 'invalid value for "goal_inflation", must be greater than or equal to -1.'
+      end
+
+      @goal_inflation = goal_inflation
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          goal_inflation == o.goal_inflation &&
-          goal_amount == o.goal_amount
+          goal_amount == o.goal_amount &&
+          goal_inflation == o.goal_inflation
     end
 
     # @see the `==` method
@@ -114,7 +114,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [goal_inflation, goal_amount].hash
+      [goal_amount, goal_inflation].hash
     end
 
     # Builds the object from hash
@@ -136,17 +136,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
@@ -178,8 +177,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
@@ -202,8 +200,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

data/lib/proton_api/models/goal_decumulation_allocation_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,59 +14,59 @@ require 'date'
 
 module ProtonApi
   class GoalDecumulationAllocationRequest
-    attr_accessor :thresh_type
-
-    attr_accessor :goal_id
-
-    attr_accessor :client_id
+    attr_accessor :recommendation_config
 
-    attr_accessor :conf_tgt
+    attr_accessor :compounding_rate
 
     attr_accessor :risk_score
 
-    attr_accessor :remove_outliers
+    attr_accessor :recommend_type
 
-    attr_accessor :allocation_priority
+    attr_accessor :create_log
+
+    attr_accessor :n
 
     attr_accessor :a_horizon
 
-    attr_accessor :withdrawal_config
+    attr_accessor :allocation_method
 
-    attr_accessor :market_data_source
+    attr_accessor :allocation_priority
 
-    attr_accessor :compounding_rate
+    attr_accessor :remove_outliers
 
     attr_accessor :adjust_for_compounding
 
-    attr_accessor :opt_config
+    attr_accessor :goal_id
 
-    attr_accessor :deposit_config
+    attr_accessor :conf_tgt
+
+    attr_accessor :trading_days_per_year
 
     attr_accessor :use_proxy_data
 
     attr_accessor :thresh
 
-    attr_accessor :horizon_frequency
+    attr_accessor :withdrawal_tax
 
-    attr_accessor :recommendation_config
+    attr_accessor :d_horizon
 
-    attr_accessor :create_log
+    attr_accessor :client_id
 
-    attr_accessor :withdrawal_tax
+    attr_accessor :opt_config
 
-    attr_accessor :trading_days_per_year
+    attr_accessor :market_data_source
 
-    attr_accessor :allocations
+    attr_accessor :thresh_type
 
-    attr_accessor :n
+    attr_accessor :horizon_frequency
 
-    attr_accessor :d_horizon
+    attr_accessor :withdrawal_config
 
-    attr_accessor :curr_inv
+    attr_accessor :allocations
 
-    attr_accessor :recommend_type
+    attr_accessor :curr_inv
 
-    attr_accessor :allocation_method
+    attr_accessor :deposit_config
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -93,66 +93,66 @@ module ProtonApi
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'thresh_type' => :'thresh_type',
-        :'goal_id' => :'goal_id',
-        :'client_id' => :'client_id',
-        :'conf_tgt' => :'conf_tgt',
+        :'recommendation_config' => :'recommendation_config',
+        :'compounding_rate' => :'compounding_rate',
         :'risk_score' => :'risk_score',
-        :'remove_outliers' => :'remove_outliers',
-        :'allocation_priority' => :'allocation_priority',
+        :'recommend_type' => :'recommend_type',
+        :'create_log' => :'create_log',
+        :'n' => :'n',
         :'a_horizon' => :'a_horizon',
-        :'withdrawal_config' => :'withdrawal_config',
-        :'market_data_source' => :'market_data_source',
-        :'compounding_rate' => :'compounding_rate',
+        :'allocation_method' => :'allocation_method',
+        :'allocation_priority' => :'allocation_priority',
+        :'remove_outliers' => :'remove_outliers',
         :'adjust_for_compounding' => :'adjust_for_compounding',
-        :'opt_config' => :'opt_config',
-        :'deposit_config' => :'deposit_config',
+        :'goal_id' => :'goal_id',
+        :'conf_tgt' => :'conf_tgt',
+        :'trading_days_per_year' => :'trading_days_per_year',
         :'use_proxy_data' => :'use_proxy_data',
         :'thresh' => :'thresh',
-        :'horizon_frequency' => :'horizon_frequency',
-        :'recommendation_config' => :'recommendation_config',
-        :'create_log' => :'create_log',
         :'withdrawal_tax' => :'withdrawal_tax',
-        :'trading_days_per_year' => :'trading_days_per_year',
-        :'allocations' => :'allocations',
-        :'n' => :'n',
         :'d_horizon' => :'d_horizon',
+        :'client_id' => :'client_id',
+        :'opt_config' => :'opt_config',
+        :'market_data_source' => :'market_data_source',
+        :'thresh_type' => :'thresh_type',
+        :'horizon_frequency' => :'horizon_frequency',
+        :'withdrawal_config' => :'withdrawal_config',
+        :'allocations' => :'allocations',
         :'curr_inv' => :'curr_inv',
-        :'recommend_type' => :'recommend_type',
-        :'allocation_method' => :'allocation_method'
+        :'deposit_config' => :'deposit_config'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'thresh_type' => :'String',
-        :'goal_id' => :'String',
-        :'client_id' => :'String',
-        :'conf_tgt' => :'Float',
+        :'recommendation_config' => :'RecommendationConfig',
+        :'compounding_rate' => :'Float',
         :'risk_score' => :'Float',
-        :'remove_outliers' => :'BOOLEAN',
-        :'allocation_priority' => :'String',
+        :'recommend_type' => :'String',
+        :'create_log' => :'BOOLEAN',
+        :'n' => :'Integer',
         :'a_horizon' => :'Integer',
-        :'withdrawal_config' => :'Array<GoalWithdrawalConfig>',
-        :'market_data_source' => :'String',
-        :'compounding_rate' => :'Float',
+        :'allocation_method' => :'String',
+        :'allocation_priority' => :'String',
+        :'remove_outliers' => :'BOOLEAN',
         :'adjust_for_compounding' => :'BOOLEAN',
-        :'opt_config' => :'OptConfig',
-        :'deposit_config' => :'Array<DecumulationGoalDepositConfig>',
+        :'goal_id' => :'String',
+        :'conf_tgt' => :'Float',
+        :'trading_days_per_year' => :'Integer',
         :'use_proxy_data' => :'BOOLEAN',
         :'thresh' => :'Float',
-        :'horizon_frequency' => :'String',
-        :'recommendation_config' => :'RecommendationConfig',
-        :'create_log' => :'BOOLEAN',
         :'withdrawal_tax' => :'Float',
-        :'trading_days_per_year' => :'Integer',
-        :'allocations' => :'Array<String>',
-        :'n' => :'Integer',
         :'d_horizon' => :'Integer',
+        :'client_id' => :'String',
+        :'opt_config' => :'OptConfig',
+        :'market_data_source' => :'String',
+        :'thresh_type' => :'String',
+        :'horizon_frequency' => :'String',
+        :'withdrawal_config' => :'Array<GoalWithdrawalConfig>',
+        :'allocations' => :'Array<String>',
         :'curr_inv' => :'Float',
-        :'recommend_type' => :'String',
-        :'allocation_method' => :'String'
+        :'deposit_config' => :'Array<DecumulationGoalDepositConfig>'
       }
     end
 
@@ -164,60 +164,54 @@ 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?(:'thresh_type')
-        self.thresh_type = attributes[:'thresh_type']
-      else
-        self.thresh_type = 'perc'
-      end
-
-      if attributes.has_key?(:'goal_id')
-        self.goal_id = attributes[:'goal_id']
-      end
-
-      if attributes.has_key?(:'client_id')
-        self.client_id = attributes[:'client_id']
+      if attributes.has_key?(:'recommendation_config')
+        self.recommendation_config = attributes[:'recommendation_config']
       end
 
-      if attributes.has_key?(:'conf_tgt')
-        self.conf_tgt = attributes[:'conf_tgt']
+      if attributes.has_key?(:'compounding_rate')
+        self.compounding_rate = attributes[:'compounding_rate']
       else
-        self.conf_tgt = 0.9
+        self.compounding_rate = 0.0
       end
 
       if attributes.has_key?(:'risk_score')
         self.risk_score = attributes[:'risk_score']
       end
 
-      if attributes.has_key?(:'remove_outliers')
-        self.remove_outliers = attributes[:'remove_outliers']
+      if attributes.has_key?(:'recommend_type')
+        self.recommend_type = attributes[:'recommend_type']
       else
-        self.remove_outliers = true
+        self.recommend_type = 'horizon'
       end
 
-      if attributes.has_key?(:'allocation_priority')
-        self.allocation_priority = attributes[:'allocation_priority']
+      if attributes.has_key?(:'create_log')
+        self.create_log = attributes[:'create_log']
+      else
+        self.create_log = false
+      end
+
+      if attributes.has_key?(:'n')
+        self.n = attributes[:'n']
+      else
+        self.n = 1000
       end
 
       if attributes.has_key?(:'a_horizon')
         self.a_horizon = attributes[:'a_horizon']
       end
 
-      if attributes.has_key?(:'withdrawal_config')
-        if (value = attributes[:'withdrawal_config']).is_a?(Array)
-          self.withdrawal_config = value
-        end
+      if attributes.has_key?(:'allocation_method')
+        self.allocation_method = attributes[:'allocation_method']
       end
 
-      if attributes.has_key?(:'market_data_source')
-        self.market_data_source = attributes[:'market_data_source']
-      else
-        self.market_data_source = 'nucleus'
+      if attributes.has_key?(:'allocation_priority')
+        self.allocation_priority = attributes[:'allocation_priority']
       end
 
-      if attributes.has_key?(:'compounding_rate')
-        self.compounding_rate = attributes[:'compounding_rate']
+      if attributes.has_key?(:'remove_outliers')
+        self.remove_outliers = attributes[:'remove_outliers']
       else
-        self.compounding_rate = 0.0
+        self.remove_outliers = true
       end
 
       if attributes.has_key?(:'adjust_for_compounding')
@@ -226,14 +220,20 @@ module ProtonApi
         self.adjust_for_compounding = false
       end
 
-      if attributes.has_key?(:'opt_config')
-        self.opt_config = attributes[:'opt_config']
+      if attributes.has_key?(:'goal_id')
+        self.goal_id = attributes[:'goal_id']
       end
 
-      if attributes.has_key?(:'deposit_config')
-        if (value = attributes[:'deposit_config']).is_a?(Array)
-          self.deposit_config = value
-        end
+      if attributes.has_key?(:'conf_tgt')
+        self.conf_tgt = attributes[:'conf_tgt']
+      else
+        self.conf_tgt = 0.9
+      end
+
+      if attributes.has_key?(:'trading_days_per_year')
+        self.trading_days_per_year = attributes[:'trading_days_per_year']
+      else
+        self.trading_days_per_year = 252
       end
 
       if attributes.has_key?(:'use_proxy_data')
@@ -246,32 +246,46 @@ module ProtonApi
         self.thresh = attributes[:'thresh']
       end
 
-      if attributes.has_key?(:'horizon_frequency')
-        self.horizon_frequency = attributes[:'horizon_frequency']
+      if attributes.has_key?(:'withdrawal_tax')
+        self.withdrawal_tax = attributes[:'withdrawal_tax']
       else
-        self.horizon_frequency = 'year'
+        self.withdrawal_tax = 0.0
       end
 
-      if attributes.has_key?(:'recommendation_config')
-        self.recommendation_config = attributes[:'recommendation_config']
+      if attributes.has_key?(:'d_horizon')
+        self.d_horizon = attributes[:'d_horizon']
       end
 
-      if attributes.has_key?(:'create_log')
-        self.create_log = attributes[:'create_log']
+      if attributes.has_key?(:'client_id')
+        self.client_id = attributes[:'client_id']
+      end
+
+      if attributes.has_key?(:'opt_config')
+        self.opt_config = attributes[:'opt_config']
+      end
+
+      if attributes.has_key?(:'market_data_source')
+        self.market_data_source = attributes[:'market_data_source']
       else
-        self.create_log = false
+        self.market_data_source = 'nucleus'
       end
 
-      if attributes.has_key?(:'withdrawal_tax')
-        self.withdrawal_tax = attributes[:'withdrawal_tax']
+      if attributes.has_key?(:'thresh_type')
+        self.thresh_type = attributes[:'thresh_type']
       else
-        self.withdrawal_tax = 0.0
+        self.thresh_type = 'perc'
       end
 
-      if attributes.has_key?(:'trading_days_per_year')
-        self.trading_days_per_year = attributes[:'trading_days_per_year']
+      if attributes.has_key?(:'horizon_frequency')
+        self.horizon_frequency = attributes[:'horizon_frequency']
       else
-        self.trading_days_per_year = 252
+        self.horizon_frequency = 'year'
+      end
+
+      if attributes.has_key?(:'withdrawal_config')
+        if (value = attributes[:'withdrawal_config']).is_a?(Array)
+          self.withdrawal_config = value
+        end
       end
 
       if attributes.has_key?(:'allocations')
@@ -280,28 +294,14 @@ module ProtonApi
         end
       end
 
-      if attributes.has_key?(:'n')
-        self.n = attributes[:'n']
-      else
-        self.n = 1000
-      end
-
-      if attributes.has_key?(:'d_horizon')
-        self.d_horizon = attributes[:'d_horizon']
-      end
-
       if attributes.has_key?(:'curr_inv')
         self.curr_inv = attributes[:'curr_inv']
       end
 
-      if attributes.has_key?(:'recommend_type')
-        self.recommend_type = attributes[:'recommend_type']
-      else
-        self.recommend_type = 'horizon'
-      end
-
-      if attributes.has_key?(:'allocation_method')
-        self.allocation_method = attributes[:'allocation_method']
+      if attributes.has_key?(:'deposit_config')
+        if (value = attributes[:'deposit_config']).is_a?(Array)
+          self.deposit_config = value
+        end
       end
     end
 
@@ -309,12 +309,8 @@ module ProtonApi
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if !@conf_tgt.nil? && @conf_tgt > 1
-        invalid_properties.push('invalid value for "conf_tgt", must be smaller than or equal to 1.')
-      end
-
-      if !@conf_tgt.nil? && @conf_tgt < 0
-        invalid_properties.push('invalid value for "conf_tgt", must be greater than or equal to 0.')
+      if !@compounding_rate.nil? && @compounding_rate < -1
+        invalid_properties.push('invalid value for "compounding_rate", must be greater than or equal to -1.')
       end
 
       if !@risk_score.nil? && @risk_score > 100
@@ -325,8 +321,12 @@ module ProtonApi
         invalid_properties.push('invalid value for "risk_score", must be greater than or equal to 0.')
       end
 
-      if @allocation_priority.nil?
-        invalid_properties.push('invalid value for "allocation_priority", allocation_priority cannot be nil.')
+      if !@n.nil? && @n > 10000
+        invalid_properties.push('invalid value for "n", must be smaller than or equal to 10000.')
+      end
+
+      if !@n.nil? && @n < 1
+        invalid_properties.push('invalid value for "n", must be greater than or equal to 1.')
       end
 
       if !@a_horizon.nil? && @a_horizon > 350
@@ -337,20 +337,20 @@ module ProtonApi
         invalid_properties.push('invalid value for "a_horizon", must be greater than or equal to 0.')
       end
 
-      if !@compounding_rate.nil? && @compounding_rate < -1
-        invalid_properties.push('invalid value for "compounding_rate", must be greater than or equal to -1.')
+      if @allocation_method.nil?
+        invalid_properties.push('invalid value for "allocation_method", allocation_method cannot be nil.')
       end
 
-      if !@thresh.nil? && @thresh < 0
-        invalid_properties.push('invalid value for "thresh", must be greater than or equal to 0.')
+      if @allocation_priority.nil?
+        invalid_properties.push('invalid value for "allocation_priority", allocation_priority cannot be nil.')
       end
 
-      if !@withdrawal_tax.nil? && @withdrawal_tax > 1
-        invalid_properties.push('invalid value for "withdrawal_tax", must be smaller than or equal to 1.')
+      if !@conf_tgt.nil? && @conf_tgt > 1
+        invalid_properties.push('invalid value for "conf_tgt", must be smaller than or equal to 1.')
       end
 
-      if !@withdrawal_tax.nil? && @withdrawal_tax < 0
-        invalid_properties.push('invalid value for "withdrawal_tax", must be greater than or equal to 0.')
+      if !@conf_tgt.nil? && @conf_tgt < 0
+        invalid_properties.push('invalid value for "conf_tgt", must be greater than or equal to 0.')
       end
 
       if !@trading_days_per_year.nil? && @trading_days_per_year > 365
@@ -361,12 +361,16 @@ module ProtonApi
         invalid_properties.push('invalid value for "trading_days_per_year", must be greater than or equal to 1.')
       end
 
-      if !@n.nil? && @n > 10000
-        invalid_properties.push('invalid value for "n", must be smaller than or equal to 10000.')
+      if !@thresh.nil? && @thresh < 0
+        invalid_properties.push('invalid value for "thresh", must be greater than or equal to 0.')
       end
 
-      if !@n.nil? && @n < 1
-        invalid_properties.push('invalid value for "n", must be greater than or equal to 1.')
+      if !@withdrawal_tax.nil? && @withdrawal_tax > 1
+        invalid_properties.push('invalid value for "withdrawal_tax", must be smaller than or equal to 1.')
+      end
+
+      if !@withdrawal_tax.nil? && @withdrawal_tax < 0
+        invalid_properties.push('invalid value for "withdrawal_tax", must be greater than or equal to 0.')
       end
 
       if !@d_horizon.nil? && @d_horizon > 350
@@ -381,72 +385,54 @@ module ProtonApi
         invalid_properties.push('invalid value for "curr_inv", must be greater than or equal to 0.')
       end
 
-      if @allocation_method.nil?
-        invalid_properties.push('invalid value for "allocation_method", allocation_method cannot be nil.')
-      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?
-      thresh_type_validator = EnumAttributeValidator.new('String', ['amnt', 'perc'])
-      return false unless thresh_type_validator.valid?(@thresh_type)
-      return false if !@conf_tgt.nil? && @conf_tgt > 1
-      return false if !@conf_tgt.nil? && @conf_tgt < 0
+    def valid?
+      return false if !@compounding_rate.nil? && @compounding_rate < -1
       return false if !@risk_score.nil? && @risk_score > 100
       return false if !@risk_score.nil? && @risk_score < 0
+      recommend_type_validator = EnumAttributeValidator.new('String', ['recurring', 'one-time', 'combo', 'horizon'])
+      return false unless recommend_type_validator.valid?(@recommend_type)
+      return false if !@n.nil? && @n > 10000
+      return false if !@n.nil? && @n < 1
+      return false if !@a_horizon.nil? && @a_horizon > 350
+      return false if !@a_horizon.nil? && @a_horizon < 0
+      return false if @allocation_method.nil?
+      allocation_method_validator = EnumAttributeValidator.new('String', ['select', 'create'])
+      return false unless allocation_method_validator.valid?(@allocation_method)
       return false if @allocation_priority.nil?
       allocation_priority_validator = EnumAttributeValidator.new('String', ['goal', 'risk'])
       return false unless allocation_priority_validator.valid?(@allocation_priority)
-      return false if !@a_horizon.nil? && @a_horizon > 350
-      return false if !@a_horizon.nil? && @a_horizon < 0
-      market_data_source_validator = EnumAttributeValidator.new('String', ['nucleus', 'integration'])
-      return false unless market_data_source_validator.valid?(@market_data_source)
-      return false if !@compounding_rate.nil? && @compounding_rate < -1
+      return false if !@conf_tgt.nil? && @conf_tgt > 1
+      return false if !@conf_tgt.nil? && @conf_tgt < 0
+      return false if !@trading_days_per_year.nil? && @trading_days_per_year > 365
+      return false if !@trading_days_per_year.nil? && @trading_days_per_year < 1
       return false if !@thresh.nil? && @thresh < 0
-      horizon_frequency_validator = EnumAttributeValidator.new('String', ['year', 'six_months', 'quarter', 'month', 'two_weeks', 'week', 'day'])
-      return false unless horizon_frequency_validator.valid?(@horizon_frequency)
       return false if !@withdrawal_tax.nil? && @withdrawal_tax > 1
       return false if !@withdrawal_tax.nil? && @withdrawal_tax < 0
-      return false if !@trading_days_per_year.nil? && @trading_days_per_year > 365
-      return false if !@trading_days_per_year.nil? && @trading_days_per_year < 1
-      return false if !@n.nil? && @n > 10000
-      return false if !@n.nil? && @n < 1
       return false if !@d_horizon.nil? && @d_horizon > 350
       return false if !@d_horizon.nil? && @d_horizon < 0
+      market_data_source_validator = EnumAttributeValidator.new('String', ['nucleus', 'integration'])
+      return false unless market_data_source_validator.valid?(@market_data_source)
+      thresh_type_validator = EnumAttributeValidator.new('String', ['amnt', 'perc'])
+      return false unless thresh_type_validator.valid?(@thresh_type)
+      horizon_frequency_validator = EnumAttributeValidator.new('String', ['year', 'six_months', 'quarter', 'month', 'two_weeks', 'week', 'day'])
+      return false unless horizon_frequency_validator.valid?(@horizon_frequency)
       return false if !@curr_inv.nil? && @curr_inv < 0
-      recommend_type_validator = EnumAttributeValidator.new('String', ['recurring', 'one-time', 'combo', 'horizon'])
-      return false unless recommend_type_validator.valid?(@recommend_type)
-      return false if @allocation_method.nil?
-      allocation_method_validator = EnumAttributeValidator.new('String', ['select', 'create'])
-      return false unless allocation_method_validator.valid?(@allocation_method)
       true
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] thresh_type Object to be assigned
-    def thresh_type=(thresh_type)
-      validator = EnumAttributeValidator.new('String', ['amnt', 'perc'])
-      unless validator.valid?(thresh_type)
-        fail ArgumentError, 'invalid value for "thresh_type", must be one of #{validator.allowable_values}.'
-      end
-      @thresh_type = thresh_type
-    end
-
     # Custom attribute writer method with validation
-    # @param [Object] conf_tgt Value to be assigned
-    def conf_tgt=(conf_tgt)
-      if !conf_tgt.nil? && conf_tgt > 1
-        fail ArgumentError, 'invalid value for "conf_tgt", must be smaller than or equal to 1.'
-      end
-
-      if !conf_tgt.nil? && conf_tgt < 0
-        fail ArgumentError, 'invalid value for "conf_tgt", must be greater than or equal to 0.'
+    # @param [Object] compounding_rate Value to be assigned
+    def compounding_rate=(compounding_rate)
+      if !compounding_rate.nil? && compounding_rate < -1
+        fail ArgumentError, 'invalid value for "compounding_rate", must be greater than or equal to -1.'
       end
 
-      @conf_tgt = conf_tgt
+      @compounding_rate = compounding_rate
     end
 
     # Custom attribute writer method with validation
@@ -464,13 +450,27 @@ module ProtonApi
     end
 
     # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] allocation_priority Object to be assigned
-    def allocation_priority=(allocation_priority)
-      validator = EnumAttributeValidator.new('String', ['goal', 'risk'])
-      unless validator.valid?(allocation_priority)
-        fail ArgumentError, 'invalid value for "allocation_priority", must be one of #{validator.allowable_values}.'
+    # @param [Object] recommend_type Object to be assigned
+    def recommend_type=(recommend_type)
+      validator = EnumAttributeValidator.new('String', ['recurring', 'one-time', 'combo', 'horizon'])
+      unless validator.valid?(recommend_type)
+        fail ArgumentError, 'invalid value for "recommend_type", must be one of #{validator.allowable_values}.'
       end
-      @allocation_priority = allocation_priority
+      @recommend_type = recommend_type
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] n Value to be assigned
+    def n=(n)
+      if !n.nil? && n > 10000
+        fail ArgumentError, 'invalid value for "n", must be smaller than or equal to 10000.'
+      end
+
+      if !n.nil? && n < 1
+        fail ArgumentError, 'invalid value for "n", must be greater than or equal to 1.'
+      end
+
+      @n = n
     end
 
     # Custom attribute writer method with validation
@@ -488,57 +488,37 @@ module ProtonApi
     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] compounding_rate Value to be assigned
-    def compounding_rate=(compounding_rate)
-      if !compounding_rate.nil? && compounding_rate < -1
-        fail ArgumentError, 'invalid value for "compounding_rate", must be greater than or equal to -1.'
-      end
-
-      @compounding_rate = compounding_rate
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] thresh Value to be assigned
-    def thresh=(thresh)
-      if !thresh.nil? && thresh < 0
-        fail ArgumentError, 'invalid value for "thresh", must be greater than or equal to 0.'
+    # @param [Object] allocation_method Object to be assigned
+    def allocation_method=(allocation_method)
+      validator = EnumAttributeValidator.new('String', ['select', 'create'])
+      unless validator.valid?(allocation_method)
+        fail ArgumentError, 'invalid value for "allocation_method", must be one of #{validator.allowable_values}.'
       end
-
-      @thresh = thresh
+      @allocation_method = allocation_method
     end
 
     # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] horizon_frequency Object to be assigned
-    def horizon_frequency=(horizon_frequency)
-      validator = EnumAttributeValidator.new('String', ['year', 'six_months', 'quarter', 'month', 'two_weeks', 'week', 'day'])
-      unless validator.valid?(horizon_frequency)
-        fail ArgumentError, 'invalid value for "horizon_frequency", must be one of #{validator.allowable_values}.'
+    # @param [Object] allocation_priority Object to be assigned
+    def allocation_priority=(allocation_priority)
+      validator = EnumAttributeValidator.new('String', ['goal', 'risk'])
+      unless validator.valid?(allocation_priority)
+        fail ArgumentError, 'invalid value for "allocation_priority", must be one of #{validator.allowable_values}.'
       end
-      @horizon_frequency = horizon_frequency
+      @allocation_priority = allocation_priority
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] withdrawal_tax Value to be assigned
-    def withdrawal_tax=(withdrawal_tax)
-      if !withdrawal_tax.nil? && withdrawal_tax > 1
-        fail ArgumentError, 'invalid value for "withdrawal_tax", must be smaller than or equal to 1.'
+    # @param [Object] conf_tgt Value to be assigned
+    def conf_tgt=(conf_tgt)
+      if !conf_tgt.nil? && conf_tgt > 1
+        fail ArgumentError, 'invalid value for "conf_tgt", must be smaller than or equal to 1.'
       end
 
-      if !withdrawal_tax.nil? && withdrawal_tax < 0
-        fail ArgumentError, 'invalid value for "withdrawal_tax", must be greater than or equal to 0.'
+      if !conf_tgt.nil? && conf_tgt < 0
+        fail ArgumentError, 'invalid value for "conf_tgt", must be greater than or equal to 0.'
       end
 
-      @withdrawal_tax = withdrawal_tax
+      @conf_tgt = conf_tgt
     end
 
     # Custom attribute writer method with validation
@@ -556,17 +536,27 @@ module ProtonApi
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] n Value to be assigned
-    def n=(n)
-      if !n.nil? && n > 10000
-        fail ArgumentError, 'invalid value for "n", must be smaller than or equal to 10000.'
+    # @param [Object] thresh Value to be assigned
+    def thresh=(thresh)
+      if !thresh.nil? && thresh < 0
+        fail ArgumentError, 'invalid value for "thresh", must be greater than or equal to 0.'
       end
 
-      if !n.nil? && n < 1
-        fail ArgumentError, 'invalid value for "n", must be greater than or equal to 1.'
+      @thresh = thresh
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] withdrawal_tax Value to be assigned
+    def withdrawal_tax=(withdrawal_tax)
+      if !withdrawal_tax.nil? && withdrawal_tax > 1
+        fail ArgumentError, 'invalid value for "withdrawal_tax", must be smaller than or equal to 1.'
       end
 
-      @n = n
+      if !withdrawal_tax.nil? && withdrawal_tax < 0
+        fail ArgumentError, 'invalid value for "withdrawal_tax", must be greater than or equal to 0.'
+      end
+
+      @withdrawal_tax = withdrawal_tax
     end
 
     # Custom attribute writer method with validation
@@ -583,34 +573,44 @@ module ProtonApi
       @d_horizon = d_horizon
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] curr_inv Value to be assigned
-    def curr_inv=(curr_inv)
-      if !curr_inv.nil? && curr_inv < 0
-        fail ArgumentError, 'invalid value for "curr_inv", must be greater than or equal to 0.'
+    # 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
-
-      @curr_inv = curr_inv
+      @market_data_source = market_data_source
     end
 
     # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] recommend_type Object to be assigned
-    def recommend_type=(recommend_type)
-      validator = EnumAttributeValidator.new('String', ['recurring', 'one-time', 'combo', 'horizon'])
-      unless validator.valid?(recommend_type)
-        fail ArgumentError, 'invalid value for "recommend_type", must be one of #{validator.allowable_values}.'
+    # @param [Object] thresh_type Object to be assigned
+    def thresh_type=(thresh_type)
+      validator = EnumAttributeValidator.new('String', ['amnt', 'perc'])
+      unless validator.valid?(thresh_type)
+        fail ArgumentError, 'invalid value for "thresh_type", must be one of #{validator.allowable_values}.'
       end
-      @recommend_type = recommend_type
+      @thresh_type = thresh_type
     end
 
     # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] allocation_method Object to be assigned
-    def allocation_method=(allocation_method)
-      validator = EnumAttributeValidator.new('String', ['select', 'create'])
-      unless validator.valid?(allocation_method)
-        fail ArgumentError, 'invalid value for "allocation_method", must be one of #{validator.allowable_values}.'
+    # @param [Object] horizon_frequency Object to be assigned
+    def horizon_frequency=(horizon_frequency)
+      validator = EnumAttributeValidator.new('String', ['year', 'six_months', 'quarter', 'month', 'two_weeks', 'week', 'day'])
+      unless validator.valid?(horizon_frequency)
+        fail ArgumentError, 'invalid value for "horizon_frequency", must be one of #{validator.allowable_values}.'
       end
-      @allocation_method = allocation_method
+      @horizon_frequency = horizon_frequency
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] curr_inv Value to be assigned
+    def curr_inv=(curr_inv)
+      if !curr_inv.nil? && curr_inv < 0
+        fail ArgumentError, 'invalid value for "curr_inv", must be greater than or equal to 0.'
+      end
+
+      @curr_inv = curr_inv
     end
 
     # Checks equality by comparing each attribute.
@@ -618,33 +618,33 @@ module ProtonApi
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          thresh_type == o.thresh_type &&
-          goal_id == o.goal_id &&
-          client_id == o.client_id &&
-          conf_tgt == o.conf_tgt &&
+          recommendation_config == o.recommendation_config &&
+          compounding_rate == o.compounding_rate &&
           risk_score == o.risk_score &&
-          remove_outliers == o.remove_outliers &&
-          allocation_priority == o.allocation_priority &&
+          recommend_type == o.recommend_type &&
+          create_log == o.create_log &&
+          n == o.n &&
           a_horizon == o.a_horizon &&
-          withdrawal_config == o.withdrawal_config &&
-          market_data_source == o.market_data_source &&
-          compounding_rate == o.compounding_rate &&
+          allocation_method == o.allocation_method &&
+          allocation_priority == o.allocation_priority &&
+          remove_outliers == o.remove_outliers &&
           adjust_for_compounding == o.adjust_for_compounding &&
-          opt_config == o.opt_config &&
-          deposit_config == o.deposit_config &&
+          goal_id == o.goal_id &&
+          conf_tgt == o.conf_tgt &&
+          trading_days_per_year == o.trading_days_per_year &&
           use_proxy_data == o.use_proxy_data &&
           thresh == o.thresh &&
-          horizon_frequency == o.horizon_frequency &&
-          recommendation_config == o.recommendation_config &&
-          create_log == o.create_log &&
           withdrawal_tax == o.withdrawal_tax &&
-          trading_days_per_year == o.trading_days_per_year &&
-          allocations == o.allocations &&
-          n == o.n &&
           d_horizon == o.d_horizon &&
+          client_id == o.client_id &&
+          opt_config == o.opt_config &&
+          market_data_source == o.market_data_source &&
+          thresh_type == o.thresh_type &&
+          horizon_frequency == o.horizon_frequency &&
+          withdrawal_config == o.withdrawal_config &&
+          allocations == o.allocations &&
           curr_inv == o.curr_inv &&
-          recommend_type == o.recommend_type &&
-          allocation_method == o.allocation_method
+          deposit_config == o.deposit_config
     end
 
     # @see the `==` method
@@ -656,7 +656,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [thresh_type, goal_id, client_id, conf_tgt, risk_score, remove_outliers, allocation_priority, a_horizon, withdrawal_config, market_data_source, compounding_rate, adjust_for_compounding, opt_config, deposit_config, use_proxy_data, thresh, horizon_frequency, recommendation_config, create_log, withdrawal_tax, trading_days_per_year, allocations, n, d_horizon, curr_inv, recommend_type, allocation_method].hash
+      [recommendation_config, compounding_rate, risk_score, recommend_type, create_log, n, a_horizon, allocation_method, allocation_priority, remove_outliers, adjust_for_compounding, goal_id, conf_tgt, trading_days_per_year, use_proxy_data, thresh, withdrawal_tax, d_horizon, client_id, opt_config, market_data_source, thresh_type, horizon_frequency, withdrawal_config, allocations, curr_inv, deposit_config].hash
     end
 
     # Builds the object from hash
@@ -678,17 +678,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
@@ -720,8 +719,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
@@ -744,8 +742,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