浏览代码

Consolidate dataframe validation logic

Ben Letham 8 年之前
父节点
当前提交
796b0f8037
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      python/fbprophet/forecaster.py

+ 2 - 2
python/fbprophet/forecaster.py

@@ -180,6 +180,8 @@ class Prophet(object):
         """
         """
         if 'y' in df:
         if 'y' in df:
             df['y'] = pd.to_numeric(df['y'])
             df['y'] = pd.to_numeric(df['y'])
+            if np.isinf(df['y'].values).any():
+                raise ValueError('Found infinity in column y.')
         df['ds'] = pd.to_datetime(df['ds'])
         df['ds'] = pd.to_datetime(df['ds'])
         if df['ds'].isnull().any():
         if df['ds'].isnull().any():
             raise ValueError('Found NaN in column ds.')
             raise ValueError('Found NaN in column ds.')
@@ -554,8 +556,6 @@ class Prophet(object):
             raise Exception('Prophet object can only be fit once. '
             raise Exception('Prophet object can only be fit once. '
                             'Instantiate a new object.')
                             'Instantiate a new object.')
         history = df[df['y'].notnull()].copy()
         history = df[df['y'].notnull()].copy()
-        if np.isinf(history['y'].values).any():
-            raise ValueError('Found infinity in column y.')
         self.history_dates = pd.to_datetime(df['ds']).sort_values()
         self.history_dates = pd.to_datetime(df['ds']).sort_values()
 
 
         history = self.setup_dataframe(history, initialize_scales=True)
         history = self.setup_dataframe(history, initialize_scales=True)