update

ZhenyiWangTHU · Oct 22, 2024 · d5bce61 · d5bce61
1 parent cf18976
commit d5bce61
Show file tree

Hide file tree

Showing 7 changed files with 103 additions and 95 deletions.
diff --git a/.Rproj.user/F5A33326/sources/per/t/9679D688 b/.Rproj.user/F5A33326/sources/per/t/9679D688
@@ -3,7 +3,7 @@
     "path": "D:/GitHub/HemaScope_Tutorial/01-HemaScope_installation_tutorial.Rmd",
     "project_path": "01-HemaScope_installation_tutorial.Rmd",
     "type": "r_markdown",
-    "hash": "797006684",
+    "hash": "1225064144",
     "contents": "",
     "dirty": false,
     "created": 1729562861292.0,
@@ -16,11 +16,11 @@
         "scrollLine": "123"
     },
     "folds": "",
-    "lastKnownWriteTime": 1729562922,
+    "lastKnownWriteTime": 1729565172,
     "encoding": "UTF-8",
     "collab_server": "",
     "source_window": "",
-    "last_content_update": 1729562922491,
+    "last_content_update": 1729565172,
     "read_only": false,
     "read_only_alternatives": []
 }
diff --git a/.Rproj.user/F5A33326/sources/per/t/9679D688-contents b/.Rproj.user/F5A33326/sources/per/t/9679D688-contents
@@ -34,6 +34,10 @@ conda config --set show_channel_urls true
 
 ## Install R
 
+<<<<<<< Updated upstream
+<!-- - R 4.3.3 and python 3.9.12 -->
+=======
+>>>>>>> Stashed changes
 - R 4.3.3
 
 ```
@@ -85,27 +89,27 @@ BiocManager::install("BiocNeighbors")
 - From CRAN
 
 ```
-install.packages(c("doMC",
-"doRNG",
-"shinyjs",
-"shiny",
-"shinyWidgets",
-"shinydashboard",
-"slickR",
-"phateR",
-"gelnet",
-"parallelDist",
-"kableExtra",
-"transport",
-"feather",
-"markdown",
-"ggalluvial",
-"forcats",
-"mcmc",
-"MCMCpack",
-"fields",
-"getopt",
-"osfr"))
+install.packages("doMC")
+install.packages("doRNG")
+install.packages("shinyjs")
+install.packages("shiny")
+install.packages("shinyWidgets")
+install.packages("shinydashboard")
+install.packages("slickR")
+install.packages("phateR")
+install.packages("gelnet")
+install.packages("parallelDist")
+install.packages("kableExtra")
+install.packages("transport")
+install.packages("feather")
+install.packages("markdown")
+install.packages("ggalluvial")
+install.packages("forcats")
+install.packages("mcmc")
+install.packages("MCMCpack")
+install.packages("fields")
+install.packages("getopt")
+install.packages("osfr")
 ```
 
 - From GitHub

diff --git a/01-HemaScope_installation_tutorial.Rmd b/01-HemaScope_installation_tutorial.Rmd
@@ -89,27 +89,27 @@ BiocManager::install("BiocNeighbors")
 - From CRAN
 
 ```
-install.packages(c("doMC",
-"doRNG",
-"shinyjs",
-"shiny",
-"shinyWidgets",
-"shinydashboard",
-"slickR",
-"phateR",
-"gelnet",
-"parallelDist",
-"kableExtra",
-"transport",
-"feather",
-"markdown",
-"ggalluvial",
-"forcats",
-"mcmc",
-"MCMCpack",
-"fields",
-"getopt",
-"osfr"))
+install.packages("doMC")
+install.packages("doRNG")
+install.packages("shinyjs")
+install.packages("shiny")
+install.packages("shinyWidgets")
+install.packages("shinydashboard")
+install.packages("slickR")
+install.packages("phateR")
+install.packages("gelnet")
+install.packages("parallelDist")
+install.packages("kableExtra")
+install.packages("transport")
+install.packages("feather")
+install.packages("markdown")
+install.packages("ggalluvial")
+install.packages("forcats")
+install.packages("mcmc")
+install.packages("MCMCpack")
+install.packages("fields")
+install.packages("getopt")
+install.packages("osfr")
 ```
 
 - From GitHub

diff --git a/_book/installation.html b/_book/installation.html
@@ -377,9 +377,11 @@ <h2><span class="header-section-number">2.2</span> Set the channels in conda<a h
 </div>
 <div id="install-r" class="section level2 hasAnchor" number="2.3">
 <h2><span class="header-section-number">2.3</span> Install R<a href="installation.html#install-r" class="anchor-section" aria-label="Anchor link to header"></a></h2>
-<ul>
-<li>R 4.3.3</li>
-</ul>
+<p>&lt;&lt;&lt;&lt;&lt;&lt;&lt; Updated upstream
+<!-- - R 4.3.3 and python 3.9.12 -->
+=======
+&gt;&gt;&gt;&gt;&gt;&gt;&gt; Stashed changes
+- R 4.3.3</p>
 <pre><code>conda install R-base=4.3.3</code></pre>
 </div>
 <div id="install-required-r-packages" class="section level2 hasAnchor" number="2.4">
@@ -423,27 +425,27 @@ <h2><span class="header-section-number">2.4</span> Install required R-packages<a
 <ul>
 <li>From CRAN</li>
 </ul>
-<pre><code>install.packages(c(&quot;doMC&quot;,
-&quot;doRNG&quot;,
-&quot;shinyjs&quot;,
-&quot;shiny&quot;,
-&quot;shinyWidgets&quot;,
-&quot;shinydashboard&quot;,
-&quot;slickR&quot;,
-&quot;phateR&quot;,
-&quot;gelnet&quot;,
-&quot;parallelDist&quot;,
-&quot;kableExtra&quot;,
-&quot;transport&quot;,
-&quot;feather&quot;,
-&quot;markdown&quot;,
-&quot;ggalluvial&quot;,
-&quot;forcats&quot;,
-&quot;mcmc&quot;,
-&quot;MCMCpack&quot;,
-&quot;fields&quot;,
-&quot;getopt&quot;,
-&quot;osfr&quot;))</code></pre>
+<pre><code>install.packages(&quot;doMC&quot;)
+install.packages(&quot;doRNG&quot;)
+install.packages(&quot;shinyjs&quot;)
+install.packages(&quot;shiny&quot;)
+install.packages(&quot;shinyWidgets&quot;)
+install.packages(&quot;shinydashboard&quot;)
+install.packages(&quot;slickR&quot;)
+install.packages(&quot;phateR&quot;)
+install.packages(&quot;gelnet&quot;)
+install.packages(&quot;parallelDist&quot;)
+install.packages(&quot;kableExtra&quot;)
+install.packages(&quot;transport&quot;)
+install.packages(&quot;feather&quot;)
+install.packages(&quot;markdown&quot;)
+install.packages(&quot;ggalluvial&quot;)
+install.packages(&quot;forcats&quot;)
+install.packages(&quot;mcmc&quot;)
+install.packages(&quot;MCMCpack&quot;)
+install.packages(&quot;fields&quot;)
+install.packages(&quot;getopt&quot;)
+install.packages(&quot;osfr&quot;)</code></pre>
 <ul>
 <li>From GitHub</li>
 </ul>

diff --git a/_book/search_index.json b/_book/search_index.json
diff --git a/docs/installation.html b/docs/installation.html
@@ -377,9 +377,11 @@ <h2><span class="header-section-number">2.2</span> Set the channels in conda<a h
 </div>
 <div id="install-r" class="section level2 hasAnchor" number="2.3">
 <h2><span class="header-section-number">2.3</span> Install R<a href="installation.html#install-r" class="anchor-section" aria-label="Anchor link to header"></a></h2>
-<ul>
-<li>R 4.3.3</li>
-</ul>
+<p>&lt;&lt;&lt;&lt;&lt;&lt;&lt; Updated upstream
+<!-- - R 4.3.3 and python 3.9.12 -->
+=======
+&gt;&gt;&gt;&gt;&gt;&gt;&gt; Stashed changes
+- R 4.3.3</p>
 <pre><code>conda install R-base=4.3.3</code></pre>
 </div>
 <div id="install-required-r-packages" class="section level2 hasAnchor" number="2.4">
@@ -423,27 +425,27 @@ <h2><span class="header-section-number">2.4</span> Install required R-packages<a
 <ul>
 <li>From CRAN</li>
 </ul>
-<pre><code>install.packages(c(&quot;doMC&quot;,
-&quot;doRNG&quot;,
-&quot;shinyjs&quot;,
-&quot;shiny&quot;,
-&quot;shinyWidgets&quot;,
-&quot;shinydashboard&quot;,
-&quot;slickR&quot;,
-&quot;phateR&quot;,
-&quot;gelnet&quot;,
-&quot;parallelDist&quot;,
-&quot;kableExtra&quot;,
-&quot;transport&quot;,
-&quot;feather&quot;,
-&quot;markdown&quot;,
-&quot;ggalluvial&quot;,
-&quot;forcats&quot;,
-&quot;mcmc&quot;,
-&quot;MCMCpack&quot;,
-&quot;fields&quot;,
-&quot;getopt&quot;,
-&quot;osfr&quot;))</code></pre>
+<pre><code>install.packages(&quot;doMC&quot;)
+install.packages(&quot;doRNG&quot;)
+install.packages(&quot;shinyjs&quot;)
+install.packages(&quot;shiny&quot;)
+install.packages(&quot;shinyWidgets&quot;)
+install.packages(&quot;shinydashboard&quot;)
+install.packages(&quot;slickR&quot;)
+install.packages(&quot;phateR&quot;)
+install.packages(&quot;gelnet&quot;)
+install.packages(&quot;parallelDist&quot;)
+install.packages(&quot;kableExtra&quot;)
+install.packages(&quot;transport&quot;)
+install.packages(&quot;feather&quot;)
+install.packages(&quot;markdown&quot;)
+install.packages(&quot;ggalluvial&quot;)
+install.packages(&quot;forcats&quot;)
+install.packages(&quot;mcmc&quot;)
+install.packages(&quot;MCMCpack&quot;)
+install.packages(&quot;fields&quot;)
+install.packages(&quot;getopt&quot;)
+install.packages(&quot;osfr&quot;)</code></pre>
 <ul>
 <li>From GitHub</li>
 </ul>

diff --git a/docs/search_index.json b/docs/search_index.json