Merge pull request #232 from massongit/update_datascience-notebook

The-Japan-DataScientist-Society · Sep 21, 2023 · 9a34b7e · 9a34b7e
2 parents d256993 + d321ab7
commit 9a34b7e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/docker/doc/answer/ans_preprocess_knock_R.html b/docker/doc/answer/ans_preprocess_knock_R.html
@@ -17434,7 +17434,7 @@ <h1 id="%E6%BC%94%E7%BF%92%E5%95%8F%E9%A1%8C">&#28436;&#32722;&#21839;&#38988;<a
 
 <span class="n">df_product_tmp</span><span class="p">[</span><span class="s">&quot;key&quot;</span><span class="p">]</span> <span class="o">&lt;-</span> <span class="m">0</span>
 
-<span class="nf">nrow</span><span class="p">(</span><span class="nf">full_join</span><span class="p">(</span><span class="n">df_store_tmp</span><span class="p">,</span> <span class="n">df_product_tmp</span><span class="p">,</span> <span class="n">by</span> <span class="o">=</span> <span class="s">&quot;key&quot;</span><span class="p">))</span>
+<span class="nf">nrow</span><span class="p">(</span><span class="nf">full_join</span><span class="p">(</span><span class="n">df_store_tmp</span><span class="p">,</span><span class="w"> </span><span class="n">df_product_tmp</span><span class="p">,</span><span class="w"> </span><span class="n">by</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">"key"</span><span class="p">,</span><span class="w"> </span><span class="n">relationship</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">"many-to-many"</span><span class="p">))</span>
 </pre></div>
 
      </div>

diff --git a/docker/work/answer/ans_preprocess_knock_R.ipynb b/docker/work/answer/ans_preprocess_knock_R.ipynb
@@ -4602,7 +4602,7 @@
     "\n",
     "df_product_tmp[\"key\"] <- 0\n",
     "\n",
-    "nrow(full_join(df_store_tmp, df_product_tmp, by = \"key\"))"
+    "nrow(full_join(df_store_tmp, df_product_tmp, by = \"key\", relationship = \"many-to-many\"))"
    ]
   },
   {
@@ -10690,7 +10690,7 @@
    "mimetype": "text/x-r-source",
    "name": "R",
    "pygments_lexer": "r",
-   "version": "4.2.2"
+   "version": "4.3.1"
   }
  },
  "nbformat": 4,

diff --git a/dockerfiles/notebook/Dockerfile b/dockerfiles/notebook/Dockerfile
@@ -1,4 +1,4 @@
-FROM jupyter/datascience-notebook:python-3.10.8
+FROM jupyter/datascience-notebook:python-3.11.5
 #FROM jupyter/datascience-notebook:d53a302fbcd0
 USER root
 ENV DEBCONF_NOWARNINGS yes