From f8775433c9a00314f21c7210a2e6d49ce382529a Mon Sep 17 00:00:00 2001
From: bl <bletham@gmail.com>
Date: Wed, 30 May 2018 16:35:17 -0700
Subject: [PATCH] Remove vestigial comments, structure imports

---
 R/R/prophet.R                              |  6 ------
 python/fbprophet/diagnostics.py            |  1 -
 python/fbprophet/forecaster.py             | 18 +++++-------------
 python/fbprophet/models.py                 |  7 -------
 python/fbprophet/tests/test_diagnostics.py |  7 ++-----
 python/fbprophet/tests/test_prophet.py     |  8 +++-----
 6 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/R/R/prophet.R b/R/R/prophet.R
index 8a2759e..1d399d2 100644
--- a/R/R/prophet.R
+++ b/R/R/prophet.R
@@ -97,8 +97,6 @@ prophet <- function(df = NULL,
                     fit = TRUE,
                     ...
 ) {
-  # fb-block 1
-
   if (!is.null(changepoints)) {
     n.changepoints <- length(changepoints)
   }
@@ -139,8 +137,6 @@ prophet <- function(df = NULL,
   if ((fit) && (!is.null(df))) {
     m <- fit.prophet(m, df, ...)
   }
-
-  # fb-block 2
   return(m)
 }
 
@@ -1509,5 +1505,3 @@ make_future_dataframe <- function(m, periods, freq = 'day',
   }
   return(data.frame(ds = dates))
 }
-
-# fb-block 3
diff --git a/python/fbprophet/diagnostics.py b/python/fbprophet/diagnostics.py
index 6245bca..38c3004 100644
--- a/python/fbprophet/diagnostics.py
+++ b/python/fbprophet/diagnostics.py
@@ -17,7 +17,6 @@ import logging
 import numpy as np
 import pandas as pd
 
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/python/fbprophet/forecaster.py b/python/fbprophet/forecaster.py
index deb749a..7da5a03 100644
--- a/python/fbprophet/forecaster.py
+++ b/python/fbprophet/forecaster.py
@@ -17,8 +17,12 @@ import warnings
 
 import numpy as np
 import pandas as pd
+try:
+    import pystan  # noqa F401
+except ImportError:
+    logger.exception('You cannot run fbprophet without pystan installed')
 
-# fb-block 1 start
+from fbprophet.diagnostics import prophet_copy
 from fbprophet.models import prophet_stan_model
 from fbprophet.plot import (
     plot,
@@ -29,21 +33,11 @@ from fbprophet.plot import (
     plot_yearly,
     plot_seasonality,
 )
-from fbprophet.diagnostics import prophet_copy
-# fb-block 1 end
 
 logging.basicConfig()
 logger = logging.getLogger(__name__)
 warnings.filterwarnings("default", category=DeprecationWarning)
 
-try:
-    import pystan  # noqa F401
-except ImportError:
-    logger.error('You cannot run prophet without pystan installed')
-    raise
-
-# fb-block 2
-
 
 class Prophet(object):
     """Prophet forecaster.
@@ -903,7 +897,6 @@ class Prophet(object):
         k = (L0 - L1) / T
         return (k, m)
 
-    # fb-block 7
     def fit(self, df, **kwargs):
         """Fit the Prophet model.
 
@@ -1024,7 +1017,6 @@ class Prophet(object):
 
         return self
 
-    # fb-block 8
     def predict(self, df=None):
         """Predict using the prophet model.
 
diff --git a/python/fbprophet/models.py b/python/fbprophet/models.py
index 50c2a35..3cdb6e4 100644
--- a/python/fbprophet/models.py
+++ b/python/fbprophet/models.py
@@ -11,22 +11,15 @@ from __future__ import print_function
 from __future__ import unicode_literals
 
 import pickle
-
-# fb-block 1 start
 import pkg_resources
-# fb-block 1 end
-# fb-block 2
 
 
 def get_prophet_stan_model():
     """Load compiled Stan model"""
-    # fb-block 3
-    # fb-block 4 start
     model_file = pkg_resources.resource_filename(
         'fbprophet',
         'stan_model/prophet_model.pkl',
     )
-    # fb-block 4 end
     with open(model_file, 'rb') as f:
         return pickle.load(f)
 
diff --git a/python/fbprophet/tests/test_diagnostics.py b/python/fbprophet/tests/test_diagnostics.py
index 0f04faa..38eff0a 100644
--- a/python/fbprophet/tests/test_diagnostics.py
+++ b/python/fbprophet/tests/test_diagnostics.py
@@ -11,13 +11,12 @@ from __future__ import print_function
 from __future__ import unicode_literals
 
 import itertools
+import os
+from unittest import TestCase
 
 import numpy as np
 import pandas as pd
 
-# fb-block 1 start
-import os
-from unittest import TestCase
 from fbprophet import Prophet
 from fbprophet import diagnostics
 
@@ -25,8 +24,6 @@ DATA_all = pd.read_csv(
     os.path.join(os.path.dirname(__file__), 'data.csv'), parse_dates=['ds']
 )
 DATA = DATA_all.head(100)
-# fb-block 1 end
-# fb-block 2
 
 
 class TestDiagnostics(TestCase):
diff --git a/python/fbprophet/tests/test_prophet.py b/python/fbprophet/tests/test_prophet.py
index 48b7a9b..460cbe3 100644
--- a/python/fbprophet/tests/test_prophet.py
+++ b/python/fbprophet/tests/test_prophet.py
@@ -10,12 +10,12 @@ from __future__ import division
 from __future__ import print_function
 from __future__ import unicode_literals
 
+import os
+from unittest import TestCase
+
 import numpy as np
 import pandas as pd
 
-# fb-block 1 start
-import os
-from unittest import TestCase
 from fbprophet import Prophet
 
 DATA = pd.read_csv(
@@ -26,8 +26,6 @@ DATA2 = pd.read_csv(
     os.path.join(os.path.dirname(__file__), 'data2.csv'),
     parse_dates=['ds'],
 )
-# fb-block 1 end
-# fb-block 2
 
 
 class TestProphet(TestCase):