vault backup: 2024-10-17 09:59:41

.obsidian/core-plugins.json

@@ -1,20 +1,30 @@
-[
+{
-  "file-explorer",
+  "file-explorer": true,
-  "global-search",
+  "global-search": true,
-  "switcher",
+  "switcher": true,
-  "graph",
+  "graph": true,
-  "backlink",
+  "backlink": true,
-  "canvas",
+  "canvas": true,
-  "outgoing-link",
+  "outgoing-link": true,
-  "tag-pane",
+  "tag-pane": true,
-  "page-preview",
+  "properties": false,
-  "daily-notes",
+  "page-preview": true,
-  "templates",
+  "daily-notes": true,
-  "note-composer",
+  "templates": true,
-  "command-palette",
+  "note-composer": true,
-  "editor-status",
+  "command-palette": true,
-  "bookmarks",
+  "slash-command": false,
-  "outline",
+  "editor-status": true,
-  "word-count",
+  "bookmarks": true,
-  "file-recovery"
+  "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
+}

.obsidian/graph.json

@@ -63,10 +63,10 @@
   "nodeSizeMultiplier": 1,
   "lineSizeMultiplier": 1,
   "collapse-forces": false,
-  "centerStrength": 0.479166666666667,
+  "centerStrength": 1,
-  "repelStrength": 8.02083333333333,
+  "repelStrength": 4.375,
-  "linkStrength": 0.864583333333333,
+  "linkStrength": 1,
   "linkDistance": 30,
-  "scale": 0.3003387451171875,
+  "scale": 0.059326171875,
-  "close": true
+  "close": false
 }

.obsidian/plugins/obsidian-pandoc-reference-list/data.json

@@ -1,21 +1,8 @@
 {
   "pathToPandoc": "/app/bin/pandoc",
   "tooltipDelay": 400,
-  "zoteroGroups": [
+  "zoteroGroups": [],
-    {
-      "id": 1,
-      "name": "My Library",
-<<<<<<< HEAD
-      "lastUpdate": 1729172877239
-=======
-      "lastUpdate": 1729105848319
->>>>>>> origin/master
-    }
-  ],
   "renderCitations": true,
   "renderCitationsReadingMode": true,
-  "renderLinkCitations": true,
+  "renderLinkCitations": true
-  "pullFromZotero": true,
-  "cslStyleURL": "https://raw.githubusercontent.com/citation-style-language/styles/master/ieee.csl",
-  "enableCiteKeyCompletion": true
 }

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)
 

conflict-files-obsidian-git.md

@@ -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
-```