proton_api 1.8.0 → 1.9.0

data/lib/proton_api/models/w_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,35 +14,35 @@ require 'date'
 
 module ProtonApi
   class WConfig
+    attr_accessor :w_min_minor
+
     attr_accessor :w_min_major
 
     attr_accessor :cash_amount
 
-    attr_accessor :w_min_minor
+    attr_accessor :w_max_major
 
     attr_accessor :w_max_minor
 
-    attr_accessor :w_max_major
-
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'w_min_minor' => :'w_min_minor',
         :'w_min_major' => :'w_min_major',
         :'cash_amount' => :'cash_amount',
-        :'w_min_minor' => :'w_min_minor',
-        :'w_max_minor' => :'w_max_minor',
-        :'w_max_major' => :'w_max_major'
+        :'w_max_major' => :'w_max_major',
+        :'w_max_minor' => :'w_max_minor'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
+        :'w_min_minor' => :'Float',
         :'w_min_major' => :'Float',
         :'cash_amount' => :'Float',
-        :'w_min_minor' => :'Float',
-        :'w_max_minor' => :'Float',
-        :'w_max_major' => :'Float'
+        :'w_max_major' => :'Float',
+        :'w_max_minor' => :'Float'
       }
     end
 
@@ -54,6 +54,10 @@ 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?(:'w_min_minor')
+        self.w_min_minor = attributes[:'w_min_minor']
+      end
+
       if attributes.has_key?(:'w_min_major')
         self.w_min_major = attributes[:'w_min_major']
       end
@@ -62,23 +66,31 @@ module ProtonApi
         self.cash_amount = attributes[:'cash_amount']
       end
 
-      if attributes.has_key?(:'w_min_minor')
-        self.w_min_minor = attributes[:'w_min_minor']
+      if attributes.has_key?(:'w_max_major')
+        self.w_max_major = attributes[:'w_max_major']
       end
 
       if attributes.has_key?(:'w_max_minor')
         self.w_max_minor = attributes[:'w_max_minor']
       end
-
-      if attributes.has_key?(:'w_max_major')
-        self.w_max_major = attributes[:'w_max_major']
-      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 @w_min_minor.nil?
+        invalid_properties.push('invalid value for "w_min_minor", w_min_minor cannot be nil.')
+      end
+
+      if @w_min_minor > 1
+        invalid_properties.push('invalid value for "w_min_minor", must be smaller than or equal to 1.')
+      end
+
+      if @w_min_minor < 0
+        invalid_properties.push('invalid value for "w_min_minor", must be greater than or equal to 0.')
+      end
+
       if @w_min_major.nil?
         invalid_properties.push('invalid value for "w_min_major", w_min_major cannot be nil.')
       end
@@ -103,16 +115,16 @@ module ProtonApi
         invalid_properties.push('invalid value for "cash_amount", must be greater than or equal to 0.')
       end
 
-      if @w_min_minor.nil?
-        invalid_properties.push('invalid value for "w_min_minor", w_min_minor cannot be nil.')
+      if @w_max_major.nil?
+        invalid_properties.push('invalid value for "w_max_major", w_max_major cannot be nil.')
       end
 
-      if @w_min_minor > 1
-        invalid_properties.push('invalid value for "w_min_minor", must be smaller than or equal to 1.')
+      if @w_max_major > 1
+        invalid_properties.push('invalid value for "w_max_major", must be smaller than or equal to 1.')
       end
 
-      if @w_min_minor < 0
-        invalid_properties.push('invalid value for "w_min_minor", must be greater than or equal to 0.')
+      if @w_max_major < 0
+        invalid_properties.push('invalid value for "w_max_major", must be greater than or equal to 0.')
       end
 
       if @w_max_minor.nil?
@@ -127,42 +139,48 @@ module ProtonApi
         invalid_properties.push('invalid value for "w_max_minor", must be greater than or equal to 0.')
       end
 
-      if @w_max_major.nil?
-        invalid_properties.push('invalid value for "w_max_major", w_max_major cannot be nil.')
-      end
-
-      if @w_max_major > 1
-        invalid_properties.push('invalid value for "w_max_major", must be smaller than or equal to 1.')
-      end
-
-      if @w_max_major < 0
-        invalid_properties.push('invalid value for "w_max_major", 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?
+      return false if @w_min_minor.nil?
+      return false if @w_min_minor > 1
+      return false if @w_min_minor < 0
       return false if @w_min_major.nil?
       return false if @w_min_major > 1
       return false if @w_min_major < 0
       return false if @cash_amount.nil?
       return false if @cash_amount > 1
       return false if @cash_amount < 0
-      return false if @w_min_minor.nil?
-      return false if @w_min_minor > 1
-      return false if @w_min_minor < 0
-      return false if @w_max_minor.nil?
-      return false if @w_max_minor > 1
-      return false if @w_max_minor < 0
       return false if @w_max_major.nil?
       return false if @w_max_major > 1
       return false if @w_max_major < 0
+      return false if @w_max_minor.nil?
+      return false if @w_max_minor > 1
+      return false if @w_max_minor < 0
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] w_min_minor Value to be assigned
+    def w_min_minor=(w_min_minor)
+      if w_min_minor.nil?
+        fail ArgumentError, 'w_min_minor cannot be nil'
+      end
+
+      if w_min_minor > 1
+        fail ArgumentError, 'invalid value for "w_min_minor", must be smaller than or equal to 1.'
+      end
+
+      if w_min_minor < 0
+        fail ArgumentError, 'invalid value for "w_min_minor", must be greater than or equal to 0.'
+      end
+
+      @w_min_minor = w_min_minor
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] w_min_major Value to be assigned
     def w_min_major=(w_min_major)
@@ -200,21 +218,21 @@ module ProtonApi
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] w_min_minor Value to be assigned
-    def w_min_minor=(w_min_minor)
-      if w_min_minor.nil?
-        fail ArgumentError, 'w_min_minor cannot be nil'
+    # @param [Object] w_max_major Value to be assigned
+    def w_max_major=(w_max_major)
+      if w_max_major.nil?
+        fail ArgumentError, 'w_max_major cannot be nil'
       end
 
-      if w_min_minor > 1
-        fail ArgumentError, 'invalid value for "w_min_minor", must be smaller than or equal to 1.'
+      if w_max_major > 1
+        fail ArgumentError, 'invalid value for "w_max_major", must be smaller than or equal to 1.'
       end
 
-      if w_min_minor < 0
-        fail ArgumentError, 'invalid value for "w_min_minor", must be greater than or equal to 0.'
+      if w_max_major < 0
+        fail ArgumentError, 'invalid value for "w_max_major", must be greater than or equal to 0.'
       end
 
-      @w_min_minor = w_min_minor
+      @w_max_major = w_max_major
     end
 
     # Custom attribute writer method with validation
@@ -235,34 +253,16 @@ module ProtonApi
       @w_max_minor = w_max_minor
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] w_max_major Value to be assigned
-    def w_max_major=(w_max_major)
-      if w_max_major.nil?
-        fail ArgumentError, 'w_max_major cannot be nil'
-      end
-
-      if w_max_major > 1
-        fail ArgumentError, 'invalid value for "w_max_major", must be smaller than or equal to 1.'
-      end
-
-      if w_max_major < 0
-        fail ArgumentError, 'invalid value for "w_max_major", must be greater than or equal to 0.'
-      end
-
-      @w_max_major = w_max_major
-    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 &&
+          w_min_minor == o.w_min_minor &&
           w_min_major == o.w_min_major &&
           cash_amount == o.cash_amount &&
-          w_min_minor == o.w_min_minor &&
-          w_max_minor == o.w_max_minor &&
-          w_max_major == o.w_max_major
+          w_max_major == o.w_max_major &&
+          w_max_minor == o.w_max_minor
     end
 
     # @see the `==` method
@@ -274,7 +274,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [w_min_major, cash_amount, w_min_minor, w_max_minor, w_max_major].hash
+      [w_min_minor, w_min_major, cash_amount, w_max_major, w_max_minor].hash
     end
 
     # Builds the object from hash
@@ -296,17 +296,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
@@ -338,8 +337,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
@@ -362,8 +360,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/w_config1.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
 
@@ -16,22 +16,22 @@ module ProtonApi
   class WConfig1
     attr_accessor :w_min_minor
 
-    attr_accessor :cash_amount
-
     attr_accessor :w_min_major
 
-    attr_accessor :w_max_minor
+    attr_accessor :cash_amount
 
     attr_accessor :w_max_major
 
+    attr_accessor :w_max_minor
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'w_min_minor' => :'w_min_minor',
-        :'cash_amount' => :'cash_amount',
         :'w_min_major' => :'w_min_major',
-        :'w_max_minor' => :'w_max_minor',
-        :'w_max_major' => :'w_max_major'
+        :'cash_amount' => :'cash_amount',
+        :'w_max_major' => :'w_max_major',
+        :'w_max_minor' => :'w_max_minor'
       }
     end
 
@@ -39,10 +39,10 @@ module ProtonApi
     def self.swagger_types
       {
         :'w_min_minor' => :'Float',
-        :'cash_amount' => :'Float',
         :'w_min_major' => :'Float',
-        :'w_max_minor' => :'Float',
-        :'w_max_major' => :'Float'
+        :'cash_amount' => :'Float',
+        :'w_max_major' => :'Float',
+        :'w_max_minor' => :'Float'
       }
     end
 
@@ -60,22 +60,16 @@ module ProtonApi
         self.w_min_minor = 0.05
       end
 
-      if attributes.has_key?(:'cash_amount')
-        self.cash_amount = attributes[:'cash_amount']
-      else
-        self.cash_amount = 0.0
-      end
-
       if attributes.has_key?(:'w_min_major')
         self.w_min_major = attributes[:'w_min_major']
       else
         self.w_min_major = 0.05
       end
 
-      if attributes.has_key?(:'w_max_minor')
-        self.w_max_minor = attributes[:'w_max_minor']
+      if attributes.has_key?(:'cash_amount')
+        self.cash_amount = attributes[:'cash_amount']
       else
-        self.w_max_minor = 1.0
+        self.cash_amount = 0.0
       end
 
       if attributes.has_key?(:'w_max_major')
@@ -83,6 +77,12 @@ module ProtonApi
       else
         self.w_max_major = 1.0
       end
+
+      if attributes.has_key?(:'w_max_minor')
+        self.w_max_minor = attributes[:'w_max_minor']
+      else
+        self.w_max_minor = 1.0
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -97,14 +97,6 @@ module ProtonApi
         invalid_properties.push('invalid value for "w_min_minor", must be greater than or equal to 0.')
       end
 
-      if !@cash_amount.nil? && @cash_amount > 1
-        invalid_properties.push('invalid value for "cash_amount", must be smaller than or equal to 1.')
-      end
-
-      if !@cash_amount.nil? && @cash_amount < 0
-        invalid_properties.push('invalid value for "cash_amount", must be greater than or equal to 0.')
-      end
-
       if !@w_min_major.nil? && @w_min_major > 1
         invalid_properties.push('invalid value for "w_min_major", must be smaller than or equal to 1.')
       end
@@ -113,12 +105,12 @@ module ProtonApi
         invalid_properties.push('invalid value for "w_min_major", must be greater than or equal to 0.')
       end
 
-      if !@w_max_minor.nil? && @w_max_minor > 1
-        invalid_properties.push('invalid value for "w_max_minor", must be smaller than or equal to 1.')
+      if !@cash_amount.nil? && @cash_amount > 1
+        invalid_properties.push('invalid value for "cash_amount", must be smaller than or equal to 1.')
       end
 
-      if !@w_max_minor.nil? && @w_max_minor < 0
-        invalid_properties.push('invalid value for "w_max_minor", must be greater than or equal to 0.')
+      if !@cash_amount.nil? && @cash_amount < 0
+        invalid_properties.push('invalid value for "cash_amount", must be greater than or equal to 0.')
       end
 
       if !@w_max_major.nil? && @w_max_major > 1
@@ -129,6 +121,14 @@ module ProtonApi
         invalid_properties.push('invalid value for "w_max_major", must be greater than or equal to 0.')
       end
 
+      if !@w_max_minor.nil? && @w_max_minor > 1
+        invalid_properties.push('invalid value for "w_max_minor", must be smaller than or equal to 1.')
+      end
+
+      if !@w_max_minor.nil? && @w_max_minor < 0
+        invalid_properties.push('invalid value for "w_max_minor", must be greater than or equal to 0.')
+      end
+
       invalid_properties
     end
 
@@ -137,14 +137,14 @@ module ProtonApi
     def valid?
       return false if !@w_min_minor.nil? && @w_min_minor > 1
       return false if !@w_min_minor.nil? && @w_min_minor < 0
-      return false if !@cash_amount.nil? && @cash_amount > 1
-      return false if !@cash_amount.nil? && @cash_amount < 0
       return false if !@w_min_major.nil? && @w_min_major > 1
       return false if !@w_min_major.nil? && @w_min_major < 0
-      return false if !@w_max_minor.nil? && @w_max_minor > 1
-      return false if !@w_max_minor.nil? && @w_max_minor < 0
+      return false if !@cash_amount.nil? && @cash_amount > 1
+      return false if !@cash_amount.nil? && @cash_amount < 0
       return false if !@w_max_major.nil? && @w_max_major > 1
       return false if !@w_max_major.nil? && @w_max_major < 0
+      return false if !@w_max_minor.nil? && @w_max_minor > 1
+      return false if !@w_max_minor.nil? && @w_max_minor < 0
       true
     end
 
@@ -162,20 +162,6 @@ module ProtonApi
       @w_min_minor = w_min_minor
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] cash_amount Value to be assigned
-    def cash_amount=(cash_amount)
-      if !cash_amount.nil? && cash_amount > 1
-        fail ArgumentError, 'invalid value for "cash_amount", must be smaller than or equal to 1.'
-      end
-
-      if !cash_amount.nil? && cash_amount < 0
-        fail ArgumentError, 'invalid value for "cash_amount", must be greater than or equal to 0.'
-      end
-
-      @cash_amount = cash_amount
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] w_min_major Value to be assigned
     def w_min_major=(w_min_major)
@@ -191,17 +177,17 @@ module ProtonApi
     end
 
     # Custom attribute writer method with validation
-    # @param [Object] w_max_minor Value to be assigned
-    def w_max_minor=(w_max_minor)
-      if !w_max_minor.nil? && w_max_minor > 1
-        fail ArgumentError, 'invalid value for "w_max_minor", must be smaller than or equal to 1.'
+    # @param [Object] cash_amount Value to be assigned
+    def cash_amount=(cash_amount)
+      if !cash_amount.nil? && cash_amount > 1
+        fail ArgumentError, 'invalid value for "cash_amount", must be smaller than or equal to 1.'
       end
 
-      if !w_max_minor.nil? && w_max_minor < 0
-        fail ArgumentError, 'invalid value for "w_max_minor", must be greater than or equal to 0.'
+      if !cash_amount.nil? && cash_amount < 0
+        fail ArgumentError, 'invalid value for "cash_amount", must be greater than or equal to 0.'
       end
 
-      @w_max_minor = w_max_minor
+      @cash_amount = cash_amount
     end
 
     # Custom attribute writer method with validation
@@ -218,16 +204,30 @@ module ProtonApi
       @w_max_major = w_max_major
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] w_max_minor Value to be assigned
+    def w_max_minor=(w_max_minor)
+      if !w_max_minor.nil? && w_max_minor > 1
+        fail ArgumentError, 'invalid value for "w_max_minor", must be smaller than or equal to 1.'
+      end
+
+      if !w_max_minor.nil? && w_max_minor < 0
+        fail ArgumentError, 'invalid value for "w_max_minor", must be greater than or equal to 0.'
+      end
+
+      @w_max_minor = w_max_minor
+    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 &&
           w_min_minor == o.w_min_minor &&
-          cash_amount == o.cash_amount &&
           w_min_major == o.w_min_major &&
-          w_max_minor == o.w_max_minor &&
-          w_max_major == o.w_max_major
+          cash_amount == o.cash_amount &&
+          w_max_major == o.w_max_major &&
+          w_max_minor == o.w_max_minor
     end
 
     # @see the `==` method
@@ -239,7 +239,7 @@ module ProtonApi
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [w_min_minor, cash_amount, w_min_major, w_max_minor, w_max_major].hash
+      [w_min_minor, w_min_major, cash_amount, w_max_major, w_max_minor].hash
     end
 
     # Builds the object from hash
@@ -261,17 +261,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
@@ -303,8 +302,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
@@ -327,8 +325,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