From 1f2e80f648dd9082ea4cf16efbd5d8e04a73ac20 Mon Sep 17 00:00:00 2001 From: Dane Sabo Date: Thu, 17 Oct 2024 09:59:41 -0400 Subject: [PATCH] vault backup: 2024-10-17 09:59:41 --- .obsidian/core-plugins.json | 50 +++++++++++-------- .obsidian/graph.json | 10 ++-- .../obsidian-pandoc-reference-list/data.json | 17 +------ .../2 Writing/2. QE State of the Art.md | 2 +- conflict-files-obsidian-git.md | 17 ------- 5 files changed, 38 insertions(+), 58 deletions(-) delete mode 100644 conflict-files-obsidian-git.md diff --git a/.obsidian/core-plugins.json b/.obsidian/core-plugins.json index 9405bfdc2..436f43cf5 100755 --- a/.obsidian/core-plugins.json +++ b/.obsidian/core-plugins.json @@ -1,20 +1,30 @@ -[ - "file-explorer", - "global-search", - "switcher", - "graph", - "backlink", - "canvas", - "outgoing-link", - "tag-pane", - "page-preview", - "daily-notes", - "templates", - "note-composer", - "command-palette", - "editor-status", - "bookmarks", - "outline", - "word-count", - "file-recovery" -] \ No newline at end of file +{ + "file-explorer": true, + "global-search": true, + "switcher": true, + "graph": true, + "backlink": true, + "canvas": true, + "outgoing-link": true, + "tag-pane": true, + "properties": false, + "page-preview": true, + "daily-notes": true, + "templates": true, + "note-composer": true, + "command-palette": true, + "slash-command": false, + "editor-status": true, + "bookmarks": true, + "markdown-importer": false, + "zk-prefixer": false, + "random-note": false, + "outline": true, + "word-count": true, + "slides": false, + "audio-recorder": false, + "workspaces": false, + "file-recovery": true, + "publish": false, + "sync": false +} \ No newline at end of file diff --git a/.obsidian/graph.json b/.obsidian/graph.json index e358dc9ba..857a7b7ee 100755 --- a/.obsidian/graph.json +++ b/.obsidian/graph.json @@ -63,10 +63,10 @@ "nodeSizeMultiplier": 1, "lineSizeMultiplier": 1, "collapse-forces": false, - "centerStrength": 0.479166666666667, - "repelStrength": 8.02083333333333, - "linkStrength": 0.864583333333333, + "centerStrength": 1, + "repelStrength": 4.375, + "linkStrength": 1, "linkDistance": 30, - "scale": 0.3003387451171875, - "close": true + "scale": 0.059326171875, + "close": false } \ No newline at end of file diff --git a/.obsidian/plugins/obsidian-pandoc-reference-list/data.json b/.obsidian/plugins/obsidian-pandoc-reference-list/data.json index 315a2411c..7c7e0121e 100755 --- a/.obsidian/plugins/obsidian-pandoc-reference-list/data.json +++ b/.obsidian/plugins/obsidian-pandoc-reference-list/data.json @@ -1,21 +1,8 @@ { "pathToPandoc": "/app/bin/pandoc", "tooltipDelay": 400, - "zoteroGroups": [ - { - "id": 1, - "name": "My Library", -<<<<<<< HEAD - "lastUpdate": 1729172877239 -======= - "lastUpdate": 1729105848319 ->>>>>>> origin/master - } - ], + "zoteroGroups": [], "renderCitations": true, "renderCitationsReadingMode": true, - "renderLinkCitations": true, - "pullFromZotero": true, - "cslStyleURL": "https://raw.githubusercontent.com/citation-style-language/styles/master/ieee.csl", - "enableCiteKeyCompletion": true + "renderLinkCitations": true } \ No newline at end of file diff --git a/4 Qualifying Exam/2 Writing/2. QE State of the Art.md b/4 Qualifying Exam/2 Writing/2. QE State of the Art.md index 396a21158..ffe09fce7 100644 --- a/4 Qualifying Exam/2 Writing/2. QE State of the Art.md +++ b/4 Qualifying Exam/2 Writing/2. QE State of the Art.md @@ -33,7 +33,7 @@ where $e_m$ is the difference between the nominal mass and the actual as-built m **Limitation:** *Structured perturbations limit the form of perturbation possible to sample.* Because structured perturbations either are chosen a priori or through a parametric study, the form of possible perturbed plants is limited. Structured perturbations do not allow for unmodelled dynamics to be included as a possible perturbation. -The other type of uncertainty considered is unstructured uncertainty. This type of uncertainty does not assume a form and thus is able to capture unmodelled behavior in its robustness analysis. Unstructured sets are advantageous compared to structured sets for this reason. Robustness with respect to unstructured sets provides a guarantee of resilience to adverse conditions that are unanticipated, or difficult to model. +The other type of uncertainty considered is unstructured uncertainty. This type of uncertainty does not assume a form and thus is able to capture unmodelled behavior in its robustness analysis. Unstructured sets are advantageous compared to structured sets for this reason. Robustness with respect to unstructured sets provides a guarantee of resilience to adverse conditions that are unanticipated, or difficult to model. One popular way of implementing unstructured uncertainty is the disk multiplicative perturbation. The disk multiplicative perturbation (The disk multiplicative perturbation) diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md deleted file mode 100644 index 52e8cfd96..000000000 --- a/conflict-files-obsidian-git.md +++ /dev/null @@ -1,17 +0,0 @@ -# Conflicts -Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push` -(This file will automatically be deleted before commit) -[[#Additional Instructions]] available below file list - -- Not a file: .obsidian/plugins/obsidian-pandoc-reference-list/data.json - -# Additional Instructions -I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text. - -```diff -<<<<<<< HEAD - File changes in local repository -======= - File changes in remote repository ->>>>>>> origin/main -``` \ No newline at end of file