@lijuhong1981/jsmath 1.0.13 → 1.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lijuhong1981/jsmath",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "",
   "main": "index.js",
   "module": "index.js",

package/src/Range.js

@@ -1,16 +1,8 @@
-import Check from "@lijuhong1981/jscheck";
+import Check, { isValid } from "@lijuhong1981/jscheck";
 import isBetween from "./isBetween.js";
 import lerp from "./lerp.js";
 import scalarInRange from "./scalarInRange.js";
 
-function checkMinMaxValue(range) {
-    if (range.minimum > range.maximum) {
-        const temp = range.minimum;
-        range.minimum = range.maximum;
-        range.maximum = temp;
-    }
-}
-
 /**
  * Range对象用来表示数学上的区间集合
 */
@@ -23,17 +15,37 @@ class Range {
      * @param {Boolean} containsMaximum 区间是否包含较大数，默认true
      */
     constructor(minimum = 0, maximum = 1, containsMinimum = true, containsMaximum = true) {
-        this.minimum = minimum;
-        this.maximum = maximum;
-        this.containsMinimum = containsMinimum;
-        this.containsMaximum = containsMaximum;
-        checkMinMaxValue(this);
+        this.setValues(minimum, maximum, containsMinimum, containsMaximum);
     }
 
     get isRange() {
         return true;
     }
 
+    ensureMinMaxValue() {
+        if (this.minimum > this.maximum) {
+            const temp = this.minimum;
+            this.minimum = this.maximum;
+            this.maximum = temp;
+        }
+        return this;
+    }
+
+    setValues(minimum, maximum, containsMinimum, containsMaximum) {
+        if (isValid(minimum))
+            this.minimum = minimum;
+        if (isValid(maximum))
+            this.maximum = maximum;
+        if (isValid(containsMinimum))
+            this.containsMinimum = containsMinimum;
+        if (isValid(containsMaximum))
+            this.containsMaximum = containsMaximum;
+
+        this.ensureMinMaxValue();
+
+        return this;
+    }
+
     /**
      * @deprecated
     */
@@ -338,7 +350,7 @@ class Range {
     }
 
     toString() {
-        return 'Range:' + this.containsMinimum ? '[' : '(' + this.minimum + ', ' + this.maximum + this.containsMaximum ? ']' : ')'
+        return 'Range:' + this.containsMinimum ? '[' : '(' + this.minimum + ', ' + this.maximum + this.containsMaximum ? ']' : ')';
     }
 };