From f47e274e40f0bc527bd97cbe4634c251a47927f2 Mon Sep 17 00:00:00 2001 From: lucfe Date: Mon, 18 Sep 2023 09:58:27 +0800 Subject: [PATCH] change some file visibility --- .../self help/_daily life wiki.md" | 50 ++++++------------- .../git wiki.md" | 47 ++++++++++------- .../cs wiki.md" | 7 +++ .../{interested in.md => _interested in.md} | 0 ...detailed.md => _interested in_detailed.md} | 0 source/_posts/{plans.md => _plans.md} | 4 +- source/_posts/{temp000.md => _temp000.md} | 0 source/_posts/{temp.html => _temp001.md} | 0 source/_posts/{temp002.md => _temp002.md} | 0 source/_posts/temp001.md | 0 10 files changed, 55 insertions(+), 53 deletions(-) rename "source/_posts/0001 Humanities/\345\223\262\345\255\246 Philosophy/self help/daily life wiki.md" => "source/_posts/0001 Humanities/\345\223\262\345\255\246 Philosophy/self help/_daily life wiki.md" (91%) rename source/_posts/{interested in.md => _interested in.md} (100%) rename source/_posts/{interested in_detailed.md => _interested in_detailed.md} (100%) rename source/_posts/{plans.md => _plans.md} (98%) rename source/_posts/{temp000.md => _temp000.md} (100%) rename source/_posts/{temp.html => _temp001.md} (100%) rename source/_posts/{temp002.md => _temp002.md} (100%) delete mode 100644 source/_posts/temp001.md diff --git "a/source/_posts/0001 Humanities/\345\223\262\345\255\246 Philosophy/self help/daily life wiki.md" "b/source/_posts/0001 Humanities/\345\223\262\345\255\246 Philosophy/self help/_daily life wiki.md" similarity index 91% rename from "source/_posts/0001 Humanities/\345\223\262\345\255\246 Philosophy/self help/daily life wiki.md" rename to "source/_posts/0001 Humanities/\345\223\262\345\255\246 Philosophy/self help/_daily life wiki.md" index 47106b9..82c6ab6 100644 --- "a/source/_posts/0001 Humanities/\345\223\262\345\255\246 Philosophy/self help/daily life wiki.md" +++ "b/source/_posts/0001 Humanities/\345\223\262\345\255\246 Philosophy/self help/_daily life wiki.md" @@ -1,6 +1,6 @@ # daily life -## 一人每天都要做的琐事通常包括日常生活中的基本自理和维护任务。以下是一些常见的例子: +## 一人每天都要做的琐事通常包括日常生活中的基本自理和维护任务。以下是一些常见的例子 1. **起床和睡觉**:每天早上起床和晚上睡觉是日常生活的基本节奏。这包括洗漱、更换衣物、上床或离床等活动。 @@ -34,7 +34,7 @@ 这些琐事可能因个人的生活方式和需求而有所不同。每个人的日常任务都会根据他们的工作、家庭、兴趣和健康状况而有所变化。然而,这些基本的自理和维护任务构成了一个健康、有序和幸福生活的基础。 -## 个人日常开销可以分为多个细致的类别,以更好地管理和记录个人财务。以下是一些常见的细致的开销类别: +## 个人日常开销可以分为多个细致的类别,以更好地管理和记录个人财务。以下是一些常见的细致的开销类别 1. **生活必需品**: - 食品和饮料:食材、外出用餐、零食、饮料等。 @@ -83,7 +83,7 @@ 每个人的具体开销类别可能因个人情况和需求而不同。为了更好地管理财务,可以制定预算,追踪每个类别的开销,并根据需要进行调整。此外,使用财务软件或应用程序可以帮助您更轻松地记录和管理您的日常开销。 -## 睡觉所需的物品因个人喜好和需求而异,但通常包括以下基本物品: +## 睡觉所需的物品因个人喜好和需求而异,但通常包括以下基本物品 1. 床:一张舒适的床是睡眠的基础。床的寿命通常可以持续多年,但要定期检查床垫的状况并考虑更换,通常建议每 7 到 10 年更换床垫。 @@ -99,7 +99,7 @@ 需要强调的是,以上周期仅供参考,实际情况可能因个人使用习惯和物品品质而有所不同。定期保持物品的清洁和维护可以延长它们的使用寿命。如果你发现床垫、枕头或其他睡眠物品已经不再提供足够的支持或舒适度,就是考虑更换它们的时候了。 -## 男性的个人卫生事项包括许多日常任务,以保持身体的清洁和健康。以下是男性需要关注的一些个人卫生事项以及具体的做法: +## 男性的个人卫生事项包括许多日常任务,以保持身体的清洁和健康。以下是男性需要关注的一些个人卫生事项以及具体的做法 1. **口腔卫生**: - **刷牙**:每天早晚刷牙,使用牙刷和牙膏,每次刷牙约2分钟。 @@ -140,7 +140,7 @@ 维护个人卫生对于健康和社交互动至关重要,可以增强自信心和幸福感。确保每天遵循适合自己的个人卫生例程,并根据需要调整。此外,也要重视健康检查和医疗保健,以确保身体健康。 -## 洗澡需要的物品和它们的购买和更换周期可以根据个人需求和偏好而有所不同。以下是通常需要的物品以及它们的一般购买和更换周期: +## 洗澡需要的物品和它们的购买和更换周期可以根据个人需求和偏好而有所不同。以下是通常需要的物品以及它们的一般购买和更换周期 1. **沐浴露/香皂:** - 购买周期:根据使用频率,通常每个月或两个月购买一次。 @@ -172,27 +172,7 @@ 请注意,这些周期只是一般建议,个人使用习惯和物品的质量会影响更换周期。最重要的是保持卫生和使用新鲜的洗浴用品,以确保个人健康和舒适。 -## 上厕所需要使用的物品通常包括以下几个方面的内容: - -1. 马桶:马桶是卫生间的主要设备之一,通常具有较长的使用寿命,可以使用多年而不需要频繁更换。然而,如果出现破损或故障,就需要立即维修或更换。 - -2. 坐便器座圈:坐便器座圈是坐在马桶上的部分,它需要定期清洁和消毒。座圈的寿命较长,但根据使用频率和维护情况,也可以在几年内更换一次。 - -3. 马桶刷和马桶刷架:马桶刷用于清洁马桶碗,通常需要定期更换刷头或整个刷子,以保持卫生。刷架可以持续使用较长时间。 - -4. 卫生纸:卫生纸是上厕所时必不可少的用品,其使用频率因个人习惯和家庭成员而异。通常,卫生纸需要定期购买,具体周期取决于使用量。 - -5. 洗手液/香皂:洗手液或香皂是卫生间洗手的必备用品,需要根据使用频率购买,一般每个月或更频繁。 - -6. 洗手台和水龙头:洗手台和水龙头的使用寿命较长,但需要定期清洁以确保卫生。 - -7. 卫生间地垫:卫生间地垫通常需要定期清洗或更换,具体周期取决于使用频率和清洁情况。 - -8. 马桶消毒剂:马桶消毒剂用于定期清洁和消毒马桶碗,购买周期取决于使用频率和产品指南建议。 - -请注意,以上周期仅供参考,具体的更换周期取决于使用频率、维护情况以及所使用的产品质量。建议根据个人的情况和卫生需求来调整更换周期。此外,保持卫生和定期清洁是确保卫生间设备持久耐用的关键。 - -## 在日本,垃圾分类非常严格,通常要将垃圾按照不同的分类方式分开处理。日常垃圾分类方法通常包括以下几个主要类别: +## 在日本,垃圾分类非常严格,通常要将垃圾按照不同的分类方式分开处理。日常垃圾分类方法通常包括以下几个主要类别 1. **可燃垃圾(もえるゴミ, Moeru Gomi)**:这包括食物残渣、纸巾、纸张、包装材料等可以燃烧的垃圾。可燃垃圾通常是每周或每两周的定期收集,要放入指定的垃圾袋中,而不是随意丢弃。 @@ -206,9 +186,10 @@ 请注意,不同地区和市区可能会有略微不同的垃圾分类规则和收集方式,因此在日本的具体地点,最好向当地政府或住所的管理机构咨询有关垃圾分类和处理的详细信息。此外,日本对垃圾分类执行非常严格,不遵守规定可能会受到罚款或其他法律制裁。 -## 湖北东部的气候呈现出四季分明的特点,夏季炎热潮湿,冬季寒冷干燥,春秋季温度适中。以下是一年中在湖北东部建议穿的衣物,换季的时间以及建议的更换和清洗频率: +## 湖北东部的气候呈现出四季分明的特点,夏季炎热潮湿,冬季寒冷干燥,春秋季温度适中。以下是一年中在湖北东部建议穿的衣物,换季的时间以及建议的更换和清洗频率 **春季(3月 - 5月):** + - 上衣:长袖或短袖T恤、薄外套、衬衫。 - 下装:裤子、牛仔裤。 - 内衣:舒适的内衣。 @@ -217,6 +198,7 @@ - 更换和清洗频率:根据穿着情况,每1-2周清洗一次。 **夏季(6月 - 8月):** + - 上衣:短袖T恤、轻薄衬衫、夏季服装。 - 下装:短裤、轻薄裙子。 - 内衣:轻薄的内衣。 @@ -225,6 +207,7 @@ - 更换和清洗频率:由于夏季容易出汗,建议每1-2次穿着后清洗。 **秋季(9月 - 11月):** + - 上衣:长袖T恤、轻薄外套、衬衫。 - 下装:裤子、牛仔裤。 - 内衣:保暖的内衣。 @@ -233,6 +216,7 @@ - 更换和清洗频率:根据穿着情况,每1-2周清洗一次。 **冬季(12月 - 2月):** + - 上衣:厚长袖衣物、冬季外套、羽绒服。 - 下装:厚裤子、保暖裤。 - 内衣:保暖内衣。 @@ -300,7 +284,7 @@ 这些是一些常见的服装类别,但根据地区、个人品味和时尚趋势,选择可能会有所不同。需要根据具体的季节和气候来合理选择衣物,以确保舒适和时尚。 -## 在中国,自来水的水质质量因地区而异。一些城市的自来水质量非常好,可以直接饮用,而其他地方的水质可能需要进一步处理。因此,是否需要在家中安装净水器过滤自来水取决于以下几个因素: +## 在中国,自来水的水质质量因地区而异。一些城市的自来水质量非常好,可以直接饮用,而其他地方的水质可能需要进一步处理。因此,是否需要在家中安装净水器过滤自来水取决于以下几个因素 1. **当地自来水质量:** 首先要了解您所居住地区的自来水质量。您可以咨询当地水务部门或相关机构,或者查看相关水质报告。如果自来水符合饮用水质量标准,那么您可能不需要额外的净水处理。 @@ -312,7 +296,7 @@ 如果您对当地自来水的质量有疑虑,或者出于个人偏好或特殊需求,考虑在家中安装净水器是一个选项。净水器的类型和品牌多种多样,可以根据您的需求和预算进行选择。请确保选择符合国家标准并定期维护的净水器,以确保净水效果和水质安全。此外,定期更换滤芯也很重要,以保持净水器的效力。最好在购买净水器之前咨询专业人士或进行详细的市场调查以选择适合您的净水器。 -## 湖北东部的季节变化明显,不同季节的气温和天气条件会影响当地人们的饮食习惯。以下是一些湖北东部不同季节的典型食物和建议,以确保各种营养摄入: +## 湖北东部的季节变化明显,不同季节的气温和天气条件会影响当地人们的饮食习惯。以下是一些湖北东部不同季节的典型食物和建议,以确保各种营养摄入 **春季(3月 - 5月):** @@ -344,9 +328,9 @@ 无论季节如何,均衡饮食对于确保各种营养摄入都非常重要。在不同季节选择当地和新鲜的食材,结合多样化的食物,有助于满足身体各种需求。此外,适量的运动和充足的水分摄入也是保持健康的关键。 -## 在中国,一人正餐准备和享用的餐具和厨房用具通常包括以下物品,以下是一个基本的清单和数量,可以根据个人需求和所准备的食物类型进行调整: +## 在中国,一人正餐准备和享用的餐具和厨房用具通常包括以下物品,以下是一个基本的清单和数量,可以根据个人需求和所准备的食物类型进行调整 -**餐具和餐桌用具:** + **餐具和餐桌用具:** 1. **餐盘**:1个,用于盛主菜和配菜。 2. **碗**:1个,用于盛汤、饭或面条等。 @@ -356,7 +340,7 @@ 6. **勺子**:1把,用于舀汤或酱料。 7. **杯子**:1个,用于饮水或其他饮料。 -**厨房用具:** + **厨房用具:** 8. **锅**:1个,用于烹饪主菜或煮汤。 9. **平底锅**:1个,用于煎炸或烹煮其他食物。 @@ -369,5 +353,3 @@ 16. **洗碗巾和纸巾**:用于擦拭和清洁。 这个清单是一个基本的参考清单,您可以根据您的具体需求和食物准备情况来调整。请注意,如果您偏向使用一次性餐具,您可能需要增加一次性筷子、餐盘和纸巾等物品。另外,要确保所有的餐具和厨房用具在使用前都要清洗干净,以确保食物的卫生和安全。 - -## \ No newline at end of file diff --git "a/source/_posts/0004 Formal science/\350\256\241\347\256\227\346\234\272\347\247\221\345\255\246\346\212\200\346\234\257 Computer science/Software notations\302\240and\302\240tools/git wiki.md" "b/source/_posts/0004 Formal science/\350\256\241\347\256\227\346\234\272\347\247\221\345\255\246\346\212\200\346\234\257 Computer science/Software notations\302\240and\302\240tools/git wiki.md" index 535813d..0084bd4 100644 --- "a/source/_posts/0004 Formal science/\350\256\241\347\256\227\346\234\272\347\247\221\345\255\246\346\212\200\346\234\257 Computer science/Software notations\302\240and\302\240tools/git wiki.md" +++ "b/source/_posts/0004 Formal science/\350\256\241\347\256\227\346\234\272\347\247\221\345\255\246\346\212\200\346\234\257 Computer science/Software notations\302\240and\302\240tools/git wiki.md" @@ -1,6 +1,5 @@ --- title: git wiki -excerpt: Commits are shown in green as 5-character IDs, and they point to their parents. Branches are shown in orange, and they point to particular commits. The current branch is identified by the special reference HEAD, which is "attached" to that branch. In this image, the five latest commits are shown, with ed4 --- ![Alt text]() @@ -119,7 +118,7 @@ Then, if you run git rm, it stages the file’s removal: Another useful thing you may want to do is to keep the file in your working tree but remove it from your staging area. In other words, you may want to keep the file on your hard drive but not have Git track it anymore. This is particularly useful if you forgot to add something to your .gitignore file and accidentally staged it, like a large log file or a bunch of .a compiled files. To do this, use the --cached option: -$ git rm --cached README +`$ git rm --cached README` You can pass files, directories, and file-glob patterns to the git rm command. That means you can do things such as: @@ -330,24 +329,26 @@ origin You can also specify -v, which shows you the URLs that Git has stored for the shortname to be used when reading and writing to that remote: `$ git remote -v` -`origin https://github.com/schacon/ticgit (fetch)` -`origin https://github.com/schacon/ticgit (push)` +`origin https://github.com/schacon/ticgit (fetch)` +`origin https://github.com/schacon/ticgit (push)` - Adding Remote Repositories -We’ve mentioned and given some demonstrations of how the git clone command implicitly adds the origin remote for you. Here’s how to add a new remote explicitly. To add a new remote Git repository as a shortname you can reference easily, run git remote add : +We’ve mentioned and given some demonstrations of how the git clone command implicitly adds the origin remote for you. Here’s how to add a new remote explicitly. To add a new remote Git repository as a shortname you can reference easily, run `git remote add `: +```bash $ git remote origin $ git remote add pb https://github.com/paulboone/ticgit $ git remote -v -origin https://github.com/schacon/ticgit (fetch) -origin https://github.com/schacon/ticgit (push) -pb https://github.com/paulboone/ticgit (fetch) -pb https://github.com/paulboone/ticgit (push) +origin https://github.com/schacon/ticgit (fetch) +origin https://github.com/schacon/ticgit (push) +pb https://github.com/paulboone/ticgit (fetch) +pb https://github.com/paulboone/ticgit (push) +``` if you want to fetch all the information that Paul has but that you don’t yet have in your repository, you can run git fetch pb: - +```bash $ git fetch pb remote: Counting objects: 43, done. remote: Compressing objects: 100% (36/36), done. @@ -356,6 +357,7 @@ Unpacking objects: 100% (43/43), done. From https://github.com/paulboone/ticgit * [new branch] master -> pb/master * [new branch] ticgit -> pb/ticgit +``` Paul’s master branch is now accessible locally as pb/master — you can merge it into one of your branches, or you can check out a local branch at that point if you want to inspect it. @@ -393,7 +395,7 @@ If you clone a repository, the command automatically adds that remote repository by default, the git clone command automatically sets up your local master branch to track the remote master branch (or whatever the default branch is called) -you can set up other tracking branches if you wish — ones that track branches on other remotes, or don’t track the master branch. The simple case is the example you just saw, running git checkout -b /. +you can set up other tracking branches if you wish — ones that track branches on other remotes, or don’t track the master branch. The simple case is the example you just saw, running `git checkout -b /`. $ git checkout -b sf origin/serverfix Branch sf set up to track remote branch serverfix from origin. @@ -408,6 +410,7 @@ Branch serverfix set up to track remote branch serverfix from origin. If you want to see what tracking branches you have set up, you can use the -vv option to git branch. This will list out your local branches with more information including what each branch is tracking and if your local branch is ahead, behind or both. +```bash hint: If you are planning on basing your work on an upstream hint: branch that already exists at the remote, you may need to hint: run "git fetch" to retrieve it. @@ -415,11 +418,14 @@ hint: hint: If you are planning to push out a new local branch that hint: will track its remote counterpart, you may want to use hint: "git push -u" to set the upstream config as you push. +``` +```bash $ git push fatal: The current branch newbrachname has no upstream branch. To push the current branch and set the remote as upstream, use git push --set-upstream origin newbrachname +``` ```bash $ git branch -vv @@ -436,7 +442,7 @@ Finally we can see that our testing branch is not tracking any remote branch. It’s important to note that these numbers are only since the last time you fetched from each server. This command does not reach out to the servers, it’s telling you about what it has cached from these servers locally. If you want totally up to date ahead and behind numbers, you’ll need to fetch from all your remotes right before running this. You could do that like this: -$ git fetch --all; git branch -vv +`$ git fetch --all; git branch -vv` ### git push @@ -446,7 +452,7 @@ By default, all pushes must cause a fast-forward merge on the remote repository. If you have a branch named serverfix that you want to work on with others, you can push it up the same way you pushed your first branch. Run git push : -$ git push origin serverfix +`$ git push origin serverfix` You can also do `git push origin serverfix:serverfix`, which does the same thing — it says, “Take my serverfix and make it the remote’s serverfix.” You can use this format to push a local branch into a remote branch that is named differently. If you didn’t want it to be called serverfix on the remote, you could instead run `git push origin serverfix:awesomebranch` to push your local serverfix branch to the awesomebranch branch on the remote project. @@ -461,7 +467,7 @@ If you do some work on your local master branch, and, in the meantime, someone e ![Alt text]() -To synchronize your work with a given remote, you run a git fetch command (in our case, git fetch origin). This command looks up which server “origin” is (in this case, it’s git.ourcompany.com), fetches any data from it that you don’t yet have, and updates your local database, moving your origin/master pointer to its new, more up-to-date position. +To synchronize your work with a given remote, you run a `git fetch ` command (in our case, git fetch origin). This command looks up which server “origin” is (in this case, it’s git.ourcompany.com), fetches any data from it that you don’t yet have, and updates your local database, moving your origin/master pointer to its new, more up-to-date position. ![Alt text]() @@ -491,7 +497,9 @@ This gives you a local branch that you can work on that starts where origin/serv Make a new repo on Github called SecondProject. Locally clone your MyfirstProject, either from disk or from Github. Then use git pull on the branches you need to move to the second repo. -git remote set-url origin git@github.com:yourname/SecondProject.git + +`git remote set-url origin git@github.com:yourname/SecondProject.git` + Push it. Note that the clone retains a shared history with MyfirstProject, which is useful if you change your mind about the "never merge" bit. @@ -502,10 +510,12 @@ Delete .git folder git init Publish your new project - -2. lcf@DESKTOP-LCF MINGW64 ~/Documents/lucfe_website_test/test_git_1/test1/test (newbrachname) +```bash +lcf@DESKTOP-LCF MINGW64 ~/Documents/lucfe_website_test/test_git_1/test1/test (newbrachname) $ cd ../test1 + + lcf@DESKTOP-LCF MINGW64 ~/Documents/lucfe_website_test/test_git_1/test1/test1 $ git clone git@github.com:lucfe2010/images-1.git Cloning into 'images-1'... @@ -774,4 +784,5 @@ origin git@github.com:lucfe2010/test.git (push) lcf@DESKTOP-LCF MINGW64 ~/Documents/lucfe_website_test/test_git_1/test1/test5/test (myb) $ git pull -Already up to date. \ No newline at end of file +Already up to date. +``` \ No newline at end of file diff --git "a/source/_posts/0004 Formal science/\350\256\241\347\256\227\346\234\272\347\247\221\345\255\246\346\212\200\346\234\257 Computer science/cs wiki.md" "b/source/_posts/0004 Formal science/\350\256\241\347\256\227\346\234\272\347\247\221\345\255\246\346\212\200\346\234\257 Computer science/cs wiki.md" index 35ee3fe..2503f2c 100644 --- "a/source/_posts/0004 Formal science/\350\256\241\347\256\227\346\234\272\347\247\221\345\255\246\346\212\200\346\234\257 Computer science/cs wiki.md" +++ "b/source/_posts/0004 Formal science/\350\256\241\347\256\227\346\234\272\347\247\221\345\255\246\346\212\200\346\234\257 Computer science/cs wiki.md" @@ -117,6 +117,13 @@ System design is the process of defining the architecture, interfaces, and data coherent连贯的 If something is coherent, it is well planned, so that it is clear and sensible and all its parts go well with each other. +## stable diffusion + + +Stable Diffusion is a deep learning, text-to-image model released in 2022 based on diffusion techniques. It is primarily used to generate detailed images conditioned on text descriptions, though it can also be applied to other tasks such as inpainting, outpainting, and generating image-to-image translations guided by a text prompt. + +Inpainting is a conservation process where damaged, deteriorated, or missing parts of an artwork are filled in to present a complete image.[1] This process is commonly used in image restoration. + ## prompt engineering One of the most exciting recent advancements is in the realm of artificial intelligence (AI), where machines are trained to think, learn, and even communicate like humans. Among the myriad of developments in areas such as generative AI, there's a subtle art that's gaining prominence: prompt engineering. diff --git a/source/_posts/interested in.md b/source/_posts/_interested in.md similarity index 100% rename from source/_posts/interested in.md rename to source/_posts/_interested in.md diff --git a/source/_posts/interested in_detailed.md b/source/_posts/_interested in_detailed.md similarity index 100% rename from source/_posts/interested in_detailed.md rename to source/_posts/_interested in_detailed.md diff --git a/source/_posts/plans.md b/source/_posts/_plans.md similarity index 98% rename from source/_posts/plans.md rename to source/_posts/_plans.md index 8448d3e..15c4a3d 100644 --- a/source/_posts/plans.md +++ b/source/_posts/_plans.md @@ -1,4 +1,6 @@ -# +--- +title: plans +--- ## everyday plans diff --git a/source/_posts/temp000.md b/source/_posts/_temp000.md similarity index 100% rename from source/_posts/temp000.md rename to source/_posts/_temp000.md diff --git a/source/_posts/temp.html b/source/_posts/_temp001.md similarity index 100% rename from source/_posts/temp.html rename to source/_posts/_temp001.md diff --git a/source/_posts/temp002.md b/source/_posts/_temp002.md similarity index 100% rename from source/_posts/temp002.md rename to source/_posts/_temp002.md diff --git a/source/_posts/temp001.md b/source/_posts/temp001.md deleted file mode 100644 index e69de29..0000000