Site updated: 2025-03-16 16:25:09

Author: simuleite

ComputerScience/基本操作/git使用/index.html

@@ -28,7 +28,7 @@
 <meta property="og:description" content="0.0 代码合并流程  在各自的分支self上进行开发 切换到develop分支，git pull --rebase同步最新代码   不要使用Git Pull git pull会创建一个新的merge commit，这样提交历史不是一条清晰的线，包含无意义的分支合并，非常混乱。 而git pull --rebase会解决这个问题，这个命令首先把你的commit放到一边，拉取最新分支状态，最后为你">
 <meta property="og:locale" content="zh_CN">
 <meta property="article:published_time" content="2023-11-08T16:00:00.000Z">
-<meta property="article:modified_time" content="2025-03-15T02:22:18.738Z">
+<meta property="article:modified_time" content="2025-03-16T01:45:57.779Z">
 <meta property="article:author" content="SIMULEITE">
 <meta property="article:tag" content="基本操作">
 <meta name="twitter:card" content="summary">
@@ -141,7 +141,7 @@
       <div class="sidebar-panel-container">
         <!--noindex-->
         <div class="post-toc-wrap sidebar-panel">
-            <div class="post-toc animated"><ol class="nav"><li class="nav-item nav-level-1"><a class="nav-link" href="#00-%E4%BB%A3%E7%A0%81%E5%90%88%E5%B9%B6%E6%B5%81%E7%A8%8B"><span class="nav-text"> 0.0 代码合并流程</span></a></li><li class="nav-item nav-level-1"><a class="nav-link" href="#10-%E7%AC%AC%E4%B8%80%E4%BB%B6%E4%BA%8Bgit-config"><span class="nav-text"> 1.0 第一件事git config</span></a></li><li class="nav-item nav-level-1"><a class="nav-link" href="#20-%E5%88%9D%E5%A7%8B%E5%8C%96%E4%BB%93%E5%BA%93"><span class="nav-text"> 2.0 初始化仓库</span></a></li><li class="nav-item nav-level-1"><a class="nav-link" href="#%E9%85%8D%E7%BD%AEssh"><span class="nav-text"> 配置SSH</span></a></li><li class="nav-item nav-level-1"><a class="nav-link" href="#tag"><span class="nav-text"> Tag</span></a></li><li class="nav-item nav-level-1"><a class="nav-link" href="#30-%E8%AE%B0%E5%BD%95%E6%9B%B4%E6%96%B0"><span class="nav-text"> 3.0 记录更新</span></a></li><li class="nav-item nav-level-1"><a class="nav-link" href="#40-%E6%8F%90%E4%BA%A4%E5%8E%86%E5%8F%B2-%E6%92%A4%E9%94%80%E6%93%8D%E4%BD%9C"><span class="nav-text"> 4.0 提交历史、撤销操作</span></a><ol class="nav-child"><li class="nav-item nav-level-2"><a class="nav-link" href="#41-%E6%8F%90%E4%BA%A4%E5%8E%86%E5%8F%B2"><span class="nav-text"> 4.1 提交历史</span></a></li><li class="nav-item nav-level-2"><a class="nav-link" href="#42-%E6%92%A4%E9%94%80"><span class="nav-text"> 4.2 撤销</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#%E6%94%BE%E5%BC%83%E4%BF%AE%E6%94%B9"><span class="nav-text"> 放弃修改</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#%E5%88%87%E6%8D%A2%E6%97%A7%E7%89%88%E6%9C%AC"><span class="nav-text"> 切换旧版本</span></a></li></ol></li></ol></li><li class="nav-item nav-level-1"><a class="nav-link" href="#50-%E8%BF%9C%E7%A8%8B%E4%BB%93%E5%BA%93"><span class="nav-text"> 5.0 远程仓库</span></a><ol class="nav-child"><li class="nav-item nav-level-2"><a class="nav-link" href="#%E8%BF%9C%E7%AB%AF%E6%93%8D%E4%BD%9C"><span class="nav-text"> 远端操作</span></a></li></ol></li><li class="nav-item nav-level-1"><a class="nav-link" href="#60-%E5%88%86%E6%94%AF"><span class="nav-text"> 6.0 分支</span></a></li><li class="nav-item nav-level-1"><a class="nav-link" href="#70-gitigore"><span class="nav-text"> 7.0 gitigore</span></a><ol class="nav-child"><li class="nav-item nav-level-2"><a class="nav-link" href="#-code5-"><span class="nav-text"> # 所有.c文件*.c # 所有chapter*&#x2F;eg&#x2F;文件夹的文件chapter*&#x2F;eg&#x2F; # 所有子目录下的.class文件**&#x2F;*.class # 不忽略hello.c文件!hello.c </span></a></li></ol></li><li class="nav-item nav-level-1"><a class="nav-link" href="#nju%E8%AE%B2%E8%A7%A3"><span class="nav-text"> NJU讲解</span></a></li><li class="nav-item nav-level-1"><a class="nav-link" href="#%E5%BB%96%E9%9B%AA%E5%B3%B0"><span class="nav-text"> 廖雪峰</span></a><ol class="nav-child"><li class="nav-item nav-level-2"><a class="nav-link" href="#%E5%9F%BA%E7%A1%80%E4%BD%BF%E7%94%A8"><span class="nav-text"> 基础使用</span></a></li><li class="nav-item nav-level-2"><a class="nav-link" href="#%E6%8C%87%E5%8D%97github%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97github-%E8%BF%9C%E7%A8%8B%E4%BB%93%E5%BA%93%E8%BF%9C%E7%A8%8B%E5%90%8C%E6%AD%A5"><span class="nav-text"> [[…&#x2F;指南&#x2F;Github使用指南#Github 远程仓库|远程同步]]</span></a></li></ol></li><li class="nav-item nav-level-1"><a class="nav-link" href="#git%E5%A6%82%E4%BD%95%E8%BF%9B%E8%A1%8C%E5%A4%9A%E4%BA%BA%E5%8D%8F%E4%BD%9C"><span class="nav-text"> Git如何进行多人协作</span></a></li></ol></div>
+            <div class="post-toc animated"><ol class="nav"><li class="nav-item nav-level-1"><a class="nav-link" href="#00-%E4%BB%A3%E7%A0%81%E5%90%88%E5%B9%B6%E6%B5%81%E7%A8%8B"><span class="nav-text"> 0.0 代码合并流程</span></a></li><li class="nav-item nav-level-1"><a class="nav-link" href="#10-%E7%AC%AC%E4%B8%80%E4%BB%B6%E4%BA%8Bgit-config"><span class="nav-text"> 1.0 第一件事git config</span></a></li><li class="nav-item nav-level-1"><a class="nav-link" href="#20-%E5%88%9D%E5%A7%8B%E5%8C%96%E4%BB%93%E5%BA%93"><span class="nav-text"> 2.0 初始化仓库</span></a></li><li class="nav-item nav-level-1"><a class="nav-link" href="#%E9%85%8D%E7%BD%AEssh"><span class="nav-text"> 配置SSH</span></a></li><li class="nav-item nav-level-1"><a class="nav-link" href="#tag"><span class="nav-text"> Tag</span></a></li><li class="nav-item nav-level-1"><a class="nav-link" href="#30-%E8%AE%B0%E5%BD%95%E6%9B%B4%E6%96%B0"><span class="nav-text"> 3.0 记录更新</span></a></li><li class="nav-item nav-level-1"><a class="nav-link" href="#40-%E6%8F%90%E4%BA%A4%E5%8E%86%E5%8F%B2-%E6%92%A4%E9%94%80%E6%93%8D%E4%BD%9C"><span class="nav-text"> 4.0 提交历史、撤销操作</span></a><ol class="nav-child"><li class="nav-item nav-level-2"><a class="nav-link" href="#41-%E6%8F%90%E4%BA%A4%E5%8E%86%E5%8F%B2"><span class="nav-text"> 4.1 提交历史</span></a></li><li class="nav-item nav-level-2"><a class="nav-link" href="#42-%E6%92%A4%E9%94%80"><span class="nav-text"> 4.2 撤销</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#%E6%94%BE%E5%BC%83%E4%BF%AE%E6%94%B9"><span class="nav-text"> 放弃修改</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#%E5%88%87%E6%8D%A2%E6%97%A7%E7%89%88%E6%9C%AC"><span class="nav-text"> 切换旧版本</span></a></li></ol></li></ol></li><li class="nav-item nav-level-1"><a class="nav-link" href="#50-%E8%BF%9C%E7%A8%8B%E4%BB%93%E5%BA%93"><span class="nav-text"> 5.0 远程仓库</span></a><ol class="nav-child"><li class="nav-item nav-level-2"><a class="nav-link" href="#%E8%BF%9C%E7%AB%AF%E6%93%8D%E4%BD%9C"><span class="nav-text"> 远端操作</span></a></li></ol></li><li class="nav-item nav-level-1"><a class="nav-link" href="#60-%E5%88%86%E6%94%AF"><span class="nav-text"> 6.0 分支</span></a></li><li class="nav-item nav-level-1"><a class="nav-link" href="#70-gitigore"><span class="nav-text"> 7.0 gitigore</span></a><ol class="nav-child"><li class="nav-item nav-level-2"><a class="nav-link" href="#-code5-"><span class="nav-text"> # 所有.c文件*.c # 所有chapter*&#x2F;eg&#x2F;文件夹的文件chapter*&#x2F;eg&#x2F; # 所有子目录下的.class文件**&#x2F;*.class # 不忽略hello.c文件!hello.c </span></a></li></ol></li><li class="nav-item nav-level-1"><a class="nav-link" href="#nju%E8%AE%B2%E8%A7%A3"><span class="nav-text"> NJU讲解</span></a></li><li class="nav-item nav-level-1"><a class="nav-link" href="#%E5%BB%96%E9%9B%AA%E5%B3%B0"><span class="nav-text"> 廖雪峰</span></a><ol class="nav-child"><li class="nav-item nav-level-2"><a class="nav-link" href="#%E5%9F%BA%E7%A1%80%E4%BD%BF%E7%94%A8"><span class="nav-text"> 基础使用</span></a></li><li class="nav-item nav-level-2"><a class="nav-link" href="#%E6%8C%87%E5%8D%97github%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97github-%E8%BF%9C%E7%A8%8B%E4%BB%93%E5%BA%93%E8%BF%9C%E7%A8%8B%E5%90%8C%E6%AD%A5"><span class="nav-text"> [[…&#x2F;指南&#x2F;Github使用指南#Github 远程仓库|远程同步]]</span></a></li></ol></li><li class="nav-item nav-level-1"><a class="nav-link" href="#git%E5%A6%82%E4%BD%95%E8%BF%9B%E8%A1%8C%E5%A4%9A%E4%BA%BA%E5%8D%8F%E4%BD%9C"><span class="nav-text"> Git如何进行多人协作</span></a></li><li class="nav-item nav-level-1"><a class="nav-link" href="#head%E8%AF%A6%E8%A7%A3"><span class="nav-text"> HEAD详解</span></a></li></ol></div>
         </div>
         <!--/noindex-->
 
@@ -223,7 +223,7 @@ <h1 class="post-title" itemprop="name headline">
         <i class="far fa-calendar-check"></i>
       </span>
       <span class="post-meta-item-text">更新于</span>
-      <time title="修改时间：2025-03-15 10:22:18" itemprop="dateModified" datetime="2025-03-15T10:22:18+08:00">2025-03-15</time>
+      <time title="修改时间：2025-03-16 09:45:57" itemprop="dateModified" datetime="2025-03-16T09:45:57+08:00">2025-03-16</time>
     </span>
 
 
@@ -287,6 +287,11 @@ <h1 id="30-记录更新"><a class="markdownIt-Anchor" href="#30-记录更新"></
 <li><code>git ls-files</code> 查看git已跟踪文件</li>
 <li><code>git commit -m &quot;comment&quot;</code> 创建一个新的提交</li>
 <li><code>git rm</code> 移除文件，<code>--cached</code>表明只删除版本文件，保留本地文件</li>
+</ul>
+<blockquote>
+<p>本地删除文件后，使用<code>git add -u file</code>来删除索引文件</p>
+</blockquote>
+<ul>
 <li><code>git rm -r --cache .</code> 取消跟踪所有文件</li>
 <li><code>git mv</code> 移动文件</li>
 </ul>
@@ -392,6 +397,9 @@ <h2 id="指南github使用指南github-远程仓库远程同步"><a class="markd
 <h1 id="git如何进行多人协作"><a class="markdownIt-Anchor" href="#git如何进行多人协作"></a> Git如何进行多人协作</h1>
 <p>使用Git多人协作，就要用到分支。<br />
 分支的特点是，将不同功能分配给不同的人开发，各个分支之间彼此独立、不受干扰。等待开发完成，只需要合并代码就可以了。</p>
+<h1 id="head详解"><a class="markdownIt-Anchor" href="#head详解"></a> HEAD详解</h1>
+<p>HEAD指向当前所在分支，使用HEAD可以方便地标记版本。<br />
+例如HEAD<sub>1，表示从HEAD往前1个版本。遇到Merge的情况，HEAD^2</sub>2表示选择第2个分支，在此基础上往前2个版本。</p>
 
     </div>
 

ComputerScience/指南/动态规划学习指南/index.html

@@ -28,7 +28,7 @@
 <meta property="og:description" content="Author：aatalyk Origin：Link Before starting the topic let me introduce myself. I am a Mobile Developer currently working in Warsaw and spending my free time for interview preparations. I started to pre">
 <meta property="og:locale" content="zh_CN">
 <meta property="article:published_time" content="2024-10-21T16:00:00.000Z">
-<meta property="article:modified_time" content="2025-03-02T01:27:56.544Z">
+<meta property="article:modified_time" content="2025-03-16T00:56:44.799Z">
 <meta property="article:author" content="SIMULEITE">
 <meta property="article:tag" content="指南">
 <meta name="twitter:card" content="summary">
@@ -141,7 +141,7 @@
       <div class="sidebar-panel-container">
         <!--noindex-->
         <div class="post-toc-wrap sidebar-panel">
-            <div class="post-toc animated"><ol class="nav"><li class="nav-item nav-level-2"><a class="nav-link" href="#patterns"><span class="nav-text"> Patterns</span></a></li><li class="nav-item nav-level-2"><a class="nav-link" href="#10-minimum-maximum-path-to-reach-a-target"><span class="nav-text"> 1.0 Minimum (Maximum) Path to Reach a Target</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#statement"><span class="nav-text"> Statement</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#approach"><span class="nav-text"> Approach</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#similar-problems"><span class="nav-text"> Similar Problems</span></a></li></ol></li><li class="nav-item nav-level-2"><a class="nav-link" href="#20-distinct-ways"><span class="nav-text"> 2.0 Distinct Ways</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#statement%E9%97%AE%E9%A2%98%E6%8F%8F%E8%BF%B0"><span class="nav-text"> Statement，问题描述</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#approach%E8%A7%A3%E9%A2%98%E6%96%B9%E6%B3%95"><span class="nav-text"> Approach，解题方法</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#similar-problems-2"><span class="nav-text"> Similar Problems</span></a></li></ol></li><li class="nav-item nav-level-2"><a class="nav-link" href="#30-merging-intervals"><span class="nav-text"> 3.0 Merging Intervals</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#statement%E9%97%AE%E9%A2%98%E6%8F%8F%E8%BF%B0-2"><span class="nav-text"> Statement，问题描述</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#approach%E8%A7%A3%E6%B3%95%E6%96%B9%E6%B3%95"><span class="nav-text"> Approach，解法方法</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#similar-problems%E7%B1%BB%E4%BC%BC%E9%97%AE%E9%A2%98"><span class="nav-text"> Similar Problems，类似问题</span></a></li></ol></li><li class="nav-item nav-level-2"><a class="nav-link" href="#40-dp-on-strings"><span class="nav-text"> 4.0 DP on Strings</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#statement%E9%97%AE%E9%A2%98%E6%8F%8F%E8%BF%B0-3"><span class="nav-text"> Statement，问题描述</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#approach%E8%A7%A3%E5%86%B3%E6%96%B9%E6%B3%95"><span class="nav-text"> Approach，解决方法</span></a></li></ol></li><li class="nav-item nav-level-2"><a class="nav-link" href="#50-decision-making"><span class="nav-text"> 5.0 Decision Making</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#statement%E9%97%AE%E9%A2%98%E6%8F%8F%E8%BF%B0-4"><span class="nav-text"> Statement，问题描述</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#approach%E8%A7%A3%E5%86%B3%E6%96%B9%E6%B3%95-2"><span class="nav-text"> Approach，解决方法</span></a></li></ol></li></ol></li><li class="nav-item nav-level-1"><a class="nav-link" href="#%E5%A6%82%E4%BD%95%E6%80%9D%E8%80%83dp%E9%97%AE%E9%A2%98"><span class="nav-text"> 如何思考DP问题</span></a></div>
+            <div class="post-toc animated"><ol class="nav"><li class="nav-item nav-level-2"><a class="nav-link" href="#patterns"><span class="nav-text"> Patterns</span></a></li><li class="nav-item nav-level-2"><a class="nav-link" href="#10-minimum-maximum-path-to-reach-a-target"><span class="nav-text"> 1.0 Minimum (Maximum) Path to Reach a Target</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#statement"><span class="nav-text"> Statement</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#approach"><span class="nav-text"> Approach</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#similar-problems"><span class="nav-text"> Similar Problems</span></a></li></ol></li><li class="nav-item nav-level-2"><a class="nav-link" href="#20-distinct-ways"><span class="nav-text"> 2.0 Distinct Ways</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#statement%E9%97%AE%E9%A2%98%E6%8F%8F%E8%BF%B0"><span class="nav-text"> Statement，问题描述</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#approach%E8%A7%A3%E9%A2%98%E6%96%B9%E6%B3%95"><span class="nav-text"> Approach，解题方法</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#similar-problems-2"><span class="nav-text"> Similar Problems</span></a></li></ol></li><li class="nav-item nav-level-2"><a class="nav-link" href="#30-merging-intervals"><span class="nav-text"> 3.0 Merging Intervals</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#statement%E9%97%AE%E9%A2%98%E6%8F%8F%E8%BF%B0-2"><span class="nav-text"> Statement，问题描述</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#approach%E8%A7%A3%E6%B3%95%E6%96%B9%E6%B3%95"><span class="nav-text"> Approach，解法方法</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#similar-problems%E7%B1%BB%E4%BC%BC%E9%97%AE%E9%A2%98"><span class="nav-text"> Similar Problems，类似问题</span></a></li></ol></li><li class="nav-item nav-level-2"><a class="nav-link" href="#40-dp-on-strings"><span class="nav-text"> 4.0 DP on Strings</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#statement%E9%97%AE%E9%A2%98%E6%8F%8F%E8%BF%B0-3"><span class="nav-text"> Statement，问题描述</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#approach%E8%A7%A3%E5%86%B3%E6%96%B9%E6%B3%95"><span class="nav-text"> Approach，解决方法</span></a></li></ol></li><li class="nav-item nav-level-2"><a class="nav-link" href="#50-decision-making"><span class="nav-text"> 5.0 Decision Making</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#statement%E9%97%AE%E9%A2%98%E6%8F%8F%E8%BF%B0-4"><span class="nav-text"> Statement，问题描述</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#approach%E8%A7%A3%E5%86%B3%E6%96%B9%E6%B3%95-2"><span class="nav-text"> Approach，解决方法</span></a></li></ol></li></ol></li><li class="nav-item nav-level-1"><a class="nav-link" href="#%E5%A6%82%E4%BD%95%E6%80%9D%E8%80%83dp%E9%97%AE%E9%A2%98"><span class="nav-text"> 如何思考DP问题</span></a><ol class="nav-child"><li class="nav-item nav-level-2"><a class="nav-link" href="#%E8%83%8C%E5%8C%85%E9%97%AE%E9%A2%98"><span class="nav-text"> 背包问题</span></a></li></ol></div>
         </div>
         <!--/noindex-->
 
@@ -223,7 +223,7 @@ <h1 class="post-title" itemprop="name headline">
         <i class="far fa-calendar-check"></i>
       </span>
       <span class="post-meta-item-text">更新于</span>
-      <time title="修改时间：2025-03-02 09:27:56" itemprop="dateModified" datetime="2025-03-02T09:27:56+08:00">2025-03-02</time>
+      <time title="修改时间：2025-03-16 08:56:44" itemprop="dateModified" datetime="2025-03-16T08:56:44+08:00">2025-03-16</time>
     </span>
 
 
@@ -403,7 +403,9 @@ <h1 id="如何思考dp问题"><a class="markdownIt-Anchor" href="#如何思考dp
 </ul>
 </li>
 </ul>
-
+<h2 id="背包问题"><a class="markdownIt-Anchor" href="#背包问题"></a> 背包问题</h2>
+<p>完全背包问题优化为1维后，依赖前一项递推，是从小到大；其余背包问题遍历体积都是从大到小。</p>
+<figure class="highlight plaintext"><table><tr><td class="code"><pre><span class="line">for 物品</span><br><span class="line">    for 体积</span><br><span class="line">        for 决策</span><br></pre></td></tr></table></figure>
     </div>