Update modifier.py - sample order check

Include the case where min train order can be larger than max sample order as well.
yoshida-lab · Mar 1, 2022 · 7c8f9ef · 7c8f9ef
1 parent 8122f90
commit 7c8f9ef
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/xenonpy/inverse/iqspr/modifier.py b/xenonpy/inverse/iqspr/modifier.py
@@ -169,11 +169,18 @@ def _fit_sample_order(self):
                 (self.sample_order[1], self._train_order[1]), RuntimeWarning)
             self.sample_order = (self.sample_order[0], self._train_order[1])
         if self._train_order and self._train_order[0] > self.sample_order[0]:
-            warnings.warn(
-                'min <sample_order>: %s is smaller than min <train_order>: %s,'
-                'min <sample_order> will be increased to min <train_order>' %
-                (self.sample_order[0], self._train_order[0]), RuntimeWarning)
-            self.sample_order = (self._train_order[0], self.sample_order[1])
+            if self._train_order[0] > self.sample_order[1]:
+                warnings.warn(
+                    'max <sample_order>: %s is smaller than min <train_order>: %s,'
+                    '<sample_order> will be replaced by the values of <train_order>' %
+                    (self.sample_order[1], self._train_order[0]), RuntimeWarning)
+                self.sample_order = (self._train_order[0], self._train_order[1])
+            else:
+                warnings.warn(
+                    'min <sample_order>: %s is smaller than min <train_order>: %s,'
+                    'min <sample_order> will be increased to min <train_order>' %
+                    (self.sample_order[0], self._train_order[0]), RuntimeWarning)
+                self.sample_order = (self._train_order[0], self.sample_order[1])
 
     def _fit_min_len(self):
         if self.sample_order[0] > self.min_len: