updates

alexxx-db · Nov 22, 2023 · ebe37f0 · ebe37f0
1 parent fce3500
commit ebe37f0
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 257 deletions.
diff --git a/docs/_toc.yml b/docs/_toc.yml
@@ -97,7 +97,11 @@ parts:
 =======
       - file: source/usecases/forecasting.rst
         title: Forecasting
+<<<<<<< HEAD
       - file: source/usecases/classification.rst
+=======
+      - file: source/usecases/prediction.rst
+>>>>>>> c317ee2f (updates)
         title: Classification
 >>>>>>> 17103d35 (updates)
 >>>>>>> 591a8656 (updates)
@@ -118,6 +122,9 @@ parts:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> c317ee2f (updates)
 =======
       - file: source/overview/connect-to-database
         title: Connect to Database
@@ -206,9 +213,12 @@ parts:
 =======
 <<<<<<< HEAD
 >>>>>>> 591a8656 (updates)
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> f028c383 (release: merge staging into master (#1032))
+=======
+>>>>>>> c317ee2f (updates)
       - file: source/usecases/homesale-forecast.rst
         title: Home Sale Forecasting
       - file: source/usecases/homerental-predict.rst
@@ -254,6 +264,7 @@ parts:
 =======
 >>>>>>> 17103d35 (updates)
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 591a8656 (updates)
 =======
 =======
@@ -439,6 +450,9 @@ parts:
 >>>>>>> 40a10ce1 (Bump v0.3.4+ dev)
 >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev)
 >>>>>>> ae08f806 (Bump v0.3.4+ dev)
+=======
+>>>>>>> 591a8656 (updates)
+>>>>>>> c317ee2f (updates)
 
   - caption: User Reference
     chapters:

diff --git a/docs/source/usecases/classification.rst b/docs/source/usecases/classification.rst
@@ -10,6 +10,9 @@ Prediction
     <td>
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> c317ee2f (updates)
         <a target="_blank" href="https://colab.research.google.com/github/georgia-tech-db/eva/blob/staging/tutorials/17-home-rental-prediction.ipynb"><img src="https://www.tensorflow.org/images/colab_logo_32px.png" width="24px" /> Run on Google Colab</a>
     </td>
     <td>
@@ -19,6 +22,7 @@ Prediction
         <a target="_blank" href="https://github.com/georgia-tech-db/eva/raw/staging/tutorials/17-home-rental-prediction.ipynb"><img src="https://www.tensorflow.org/images/download_logo_32px.png" width="24px" /> Download notebook</a>
 =======
         <a target="_blank" href="https://colab.research.google.com/github/georgia-tech-db/eva/blob/staging/tutorials/17-home-rental-prediction.ipynb"><img src="https://www.tensorflow.org/images/colab_logo_32px.png" /> Run on Google Colab</a>
+<<<<<<< HEAD
 =======
         <a target="_blank" href="https://colab.research.google.com/github/georgia-tech-db/eva/blob/staging/tutorials/17-home-rental-prediction.ipynb"><img src="https://www.tensorflow.org/images/colab_logo_32px.png" width="24px" /> Run on Google Colab</a>
 >>>>>>> fbfc3ace (docs: updates)
@@ -33,6 +37,15 @@ Prediction
 =======
         <a target="_blank" href="https://github.com/georgia-tech-db/eva/raw/staging/tutorials/17-home-rental-prediction.ipynb"><img src="https://www.tensorflow.org/images/download_logo_32px.png" width="24px" /> Download notebook</a>
 >>>>>>> fbfc3ace (docs: updates)
+=======
+    </td>
+    <td>
+        <a target="_blank" href="https://github.com/georgia-tech-db/eva/blob/staging/tutorials/17-home-rental-prediction.ipynb"><img src="https://www.tensorflow.org/images/GitHub-Mark-32px.png" /> View source on GitHub</a>
+    </td>
+    <td>
+        <a target="_blank" href="https://github.com/georgia-tech-db/eva/raw/staging/tutorials/17-home-rental-prediction.ipynb"><img src="https://www.tensorflow.org/images/download_logo_32px.png" /> Download notebook</a>
+>>>>>>> 591a8656 (updates)
+>>>>>>> c317ee2f (updates)
     </td>
     </table><br><br>
     </embed>
@@ -90,13 +103,19 @@ We set the training time out to be ``3600`` seconds.
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> c317ee2f (updates)
    The :ref:`ludwig` page lists all the configurable parameters for the model training framework.
 =======
    The :ref:`ludwig` page lists all the configurable paramters for the model training framework.
 >>>>>>> 591a8656 (updates)
+<<<<<<< HEAD
 =======
    The :ref:`ludwig` page lists all the configurable parameters for the model training framework.
 >>>>>>> 5b27053e (ran spellchecker)
+=======
+>>>>>>> c317ee2f (updates)
 
 This query returns the trained model:
 
@@ -153,11 +172,17 @@ Here is the query's output:
 .. include:: ../shared/footer.rst
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> c317ee2f (updates)
 
 .. include:: ../shared/designs/design10.rst
 =======
 >>>>>>> 591a8656 (updates)
+<<<<<<< HEAD
 =======
 
 .. include:: ../shared/designs/design10.rst
 >>>>>>> e867f37e (docs: updated images)
+=======
+>>>>>>> c317ee2f (updates)
diff --git a/docs/source/usecases/forecasting.rst b/docs/source/usecases/forecasting.rst
@@ -10,6 +10,9 @@ Home Sale Forecasting
     <td>
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> c317ee2f (updates)
         <a target="_blank" href="https://colab.research.google.com/github/georgia-tech-db/eva/blob/staging/tutorials/16-homesale-forecasting.ipynb"><img src="https://www.tensorflow.org/images/colab_logo_32px.png" width="24px" /> Run on Google Colab</a>
     </td>
     <td>
@@ -19,6 +22,7 @@ Home Sale Forecasting
         <a target="_blank" href="https://github.com/georgia-tech-db/eva/raw/staging/tutorials/16-homesale-forecasting.ipynb"><img src="https://www.tensorflow.org/images/download_logo_32px.png" width="24px" /> Download notebook</a>
 =======
         <a target="_blank" href="https://colab.research.google.com/github/georgia-tech-db/eva/blob/staging/tutorials/16-homesale-forecasting.ipynb"><img src="https://www.tensorflow.org/images/colab_logo_32px.png" /> Run on Google Colab</a>
+<<<<<<< HEAD
 =======
         <a target="_blank" href="https://colab.research.google.com/github/georgia-tech-db/eva/blob/staging/tutorials/16-homesale-forecasting.ipynb"><img src="https://www.tensorflow.org/images/colab_logo_32px.png" width="24px" /> Run on Google Colab</a>
 >>>>>>> fbfc3ace (docs: updates)
@@ -33,6 +37,15 @@ Home Sale Forecasting
 =======
         <a target="_blank" href="https://github.com/georgia-tech-db/eva/raw/staging/tutorials/16-homesale-forecasting.ipynb"><img src="https://www.tensorflow.org/images/download_logo_32px.png" width="24px" /> Download notebook</a>
 >>>>>>> fbfc3ace (docs: updates)
+=======
+    </td>
+    <td>
+        <a target="_blank" href="https://github.com/georgia-tech-db/eva/blob/staging/tutorials/16-homesale-forecasting.ipynb"><img src="https://www.tensorflow.org/images/GitHub-Mark-32px.png" /> View source on GitHub</a>
+    </td>
+    <td>
+        <a target="_blank" href="https://github.com/georgia-tech-db/eva/raw/staging/tutorials/16-homesale-forecasting.ipynb"><img src="https://www.tensorflow.org/images/download_logo_32px.png" /> Download notebook</a>
+>>>>>>> 591a8656 (updates)
+>>>>>>> c317ee2f (updates)
     </td>
     </table><br><br>
     </embed>
@@ -104,13 +117,19 @@ This query returns the trained model:
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> c317ee2f (updates)
    The :ref:`forecast` page lists all the configurable parameters for the forecasting model.
 =======
    The :ref:`forecast` page lists all the configurable paramters for the forecasting model.
 >>>>>>> 591a8656 (updates)
+<<<<<<< HEAD
 =======
    The :ref:`forecast` page lists all the configurable parameters for the forecasting model.
 >>>>>>> 5b27053e (ran spellchecker)
+=======
+>>>>>>> c317ee2f (updates)
 
 In the ``home_sales`` dataset, we have two different types of properties -- houses and units, and price gap between them is large. To get better forecasts,
 we specify the ``propertytype`` column as the ``ID`` of the time series data.
@@ -162,11 +181,17 @@ Here is the query's output:
 .. include:: ../shared/footer.rst
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> c317ee2f (updates)
 
 .. include:: ../shared/designs/design11.rst
 =======
 >>>>>>> 591a8656 (updates)
+<<<<<<< HEAD
 =======
 
 .. include:: ../shared/designs/design11.rst
 >>>>>>> e867f37e (docs: updated images)
+=======
+>>>>>>> c317ee2f (updates)
diff --git a/docs/source/usecases/homerental-predict.rst b/docs/source/usecases/homerental-predict.rst