Updated syntax for latest CSV/DataFrames changes

Author: MatthewStuber

notebooks/SolarHybridization/SolarHybridization.ipynb

@@ -11,7 +11,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "This example comes from M.D. Stuber. A Differentiable Model for Optimizing Hybridization of Industrial Process Heat Systems with Concentrating Solar Thermal Power. *Processes*, 6(7), 76 (2018) DOI: [10.3390/pr6070076](https://doi.org/10.3390/pr6070076)\n",
+    "This example comes from M.D. Stuber. A Differentiable Model for Optimizing Hybridization of Industrial Process Heat Systems with Concentrating Solar Thermal Power. _Processes_, 6(7), 76 (2018) DOI: [10.3390/pr6070076](https://doi.org/10.3390/pr6070076)\n",
     "\n",
     "In this example, we seek to determine the optimal thermal energy storage capacity and parabolic trough solar array aperture area that maximizes the lifecycle savings associated with augmenting a conventional natural gas industrial process heat system.  Here, we use user-defined functions, the JuMP modeling language, the EAGO spatial branch-and-bound algorithm with custom upper- and lower-bounding procedures, and the IPOPT algorithm for solving the bounding subproblems.\n",
     "\n",
@@ -42,7 +42,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "using CSV;"
+    "using CSV, DataFrames;"
    ]
   },
   {
@@ -59,19 +59,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
-    "include(\"smoothMinMaxAbs.jl\")\n",
     "include(\"solarAngles.jl\")\n",
     "include(\"PTCmodel.jl\")\n",
     "include(\"iphProcessSmooth.jl\")\n",
     "include(\"lifecycleCost.jl\")\n",
-    "\n",
     "# Step 1: read the data into a table and extract the appropriate data into a vector\n",
     "input_file = \"FirebaughTMY_Julia.csv\"\n",
-    "solData = CSV.read(input_file)\n",
+    "solData = CSV.File(input_file) |> DataFrame\n",
     "yData = convert(Array{Float64,1},solData[:,7])\n",
     "\n",
     "# Step 2: get the specific thermal power potential for the region [kW/m^2]\n",
@@ -90,7 +88,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -106,7 +104,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -161,7 +159,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -215,7 +213,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -240,7 +238,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -262,28 +260,31 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 14,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "-------------------------------------------------------------------------------------------------------\n",
-      "|  Iteration #  |   Nodes  | Lower Bound | Upper Bound  |    Gap    |   Ratio   |  Time   | Time Left |\n",
-      "-------------------------------------------------------------------------------------------------------\n",
-      "|            1  |        2 |    -7.531E6 |     3.084E2  |  7.531E6  |   1.000E0 |  1.211E0 |   9.988E2  |\n",
-      "|            2  |        3 |    -7.531E6 |     3.084E2  |  7.531E6  |   1.000E0 |  2.007E0 |   9.980E2  |\n",
-      "|            3  |        2 |    -7.492E6 |    -7.318E6  |  1.740E5  |  2.322E-2 |  5.518E0 |   9.945E2  |\n",
-      "|            4  |        1 |    -7.492E6 |    -7.318E6  |  1.740E5  |  2.322E-2 |  5.787E0 |   9.942E2  |\n",
-      "|            5  |        2 |    -7.344E6 |    -7.318E6  |  2.654E4  |  3.614E-3 |  7.950E0 |   9.920E2  |\n",
-      "First Solution Found at Node 7\n",
-      "UBD = -7.317666312971923e6\n",
+      "-----------------------------------------------------------------------------------------------------------------------------\n",
+      "|  Iteration #  |     Nodes    | Lower Bound  |  Upper Bound  |      Gap     |     Ratio    |     Time     |    Time Left   |\n",
+      "-----------------------------------------------------------------------------------------------------------------------------\n",
+      "|            1  |            2 |    --0.753E7 |      0.308E3  |     0.753E7  |      0.100E1 |      0.647E0 |       0.999E3  |\n",
+      "|            2  |            3 |    --0.753E7 |      0.308E3  |     0.753E7  |      0.100E1 |      0.142E2 |       0.986E3  |\n",
+      "|            3  |            4 |    --0.749E7 |      0.308E3  |     0.749E7  |      0.100E1 |      0.279E2 |       0.972E3  |\n",
+      "|            4  |            5 |    --0.749E7 |      0.308E3  |     0.749E7  |      0.100E1 |      0.408E2 |       0.959E3  |\n",
+      "|            5  |            2 |    --0.734E7 |    --0.732E7  |     0.265E5  |     0.361E-2 |      0.420E2 |       0.958E3  |\n",
+      " \n",
+      "First Solution Found at Node 9\n",
+      "LBD = -7.344210617924415e6\n",
+      "UBD = -7.3176663129719095e6\n",
       "Solution is :\n",
-      "    X[1] = 11.722361250304994\n",
-      "    X[2] = 43615.190600813985\n",
-      "  7.957378 seconds (513.77 k allocations: 5.701 GiB, 9.31% gc time)\n",
-      "xts* = 11.722361250304994 xa* = 43615.190600813985 f* = 7.317666312971923e6 SF* = 0.6980196901665338\n",
+      "    X[1] = 11.722361246205823\n",
+      "    X[2] = 43615.19059009129\n",
+      " \n",
+      " 41.952241 seconds (5.48 M allocations: 60.761 GiB, 4.64% gc time)\n",
+      "xts* = 11.722361246205823 xa* = 43615.19059009129 f* = 7.3176663129719095e6 SF* = 0.6980196900769012\n",
       "Algorithm terminated with a status of OPTIMAL and a result code of FEASIBLE_POINT\n"
      ]
     }
@@ -313,15 +314,15 @@
    "lastKernelId": null
   },
   "kernelspec": {
-   "display_name": "Julia 1.3.1",
+   "display_name": "Julia 1.6.1",
    "language": "julia",
-   "name": "julia-1.3"
+   "name": "julia-1.6"
   },
   "language_info": {
    "file_extension": ".jl",
    "mimetype": "application/julia",
    "name": "julia",
-   "version": "1.3.1"
+   "version": "1.6.1"
   }
  },
  "nbformat": 4,