fixin shit

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

@@ -5,7 +5,11 @@
     {
       "id": 1,
       "name": "My Library",
+<<<<<<< HEAD
       "lastUpdate": 1729172877239
+=======
+      "lastUpdate": 1729105848319
+>>>>>>> origin/master
     }
   ],
   "renderCitations": true,

4 Qualifying Exam/1 Managing Stuff/0. QE To Do List.md

@@ -1,8 +1,14 @@
 - [x] Read email from Dr. Cho with shared documents 📅 2024-09-25 ⏳ 2024-09-25 [completion:: 2024-10-16]
 - [x] Find papers on verifying robustness⏳ 2024-10-15 📅 2024-10-16 [completion:: 2024-10-15]
 - [ ] Start writing about diffusion model📅 2024-10-15 
-- [ ] Write about how to generate unstructured perturbations📅 2024-10-15 
-
+	- [ ] What is the generative diffusion model? How does it work?
+	- [ ] How can we use this to generate new plants?
+	- [ ] How are we going to tell if they're in the unstrucutred perturbation disk?
+- [ ] Create a one dimensional diffusion generative model 📅 2024-10-22 ⏳ 2024-10-17 
+- [/] Write about how to generate unstructured perturbations📅 2024-10-15 
+	- [/] What is disk uncertainty? [completion:: 2024-10-16]
+	- [ ] Why is this something difficult to sample?
+- [x] Write about how to generate structured perturbations 📅 2024-10-17 ✅ 2024-10-16
 # Milestones
 - [x] Goals and Outcomes Finished 🆔 kwyu6a ⏳ 2024-10-02 📅 2024-10-04 ✅ 2024-10-02
 - [*] State of the Art Finished 🆔 i9ybdy ⏳ 2024-10-09 📅 2024-10-11

4 Qualifying Exam/2 Writing/2. QE State of the Art.md

@@ -22,6 +22,18 @@ Robustness is dependent on two features: the characteristic to be guaranteed, an
 
 Suppose a plant representing a spring-mass-damper system is described as follows @controltutorialsformatlab&simulinkInvertedPendulumSystem:
 $$ P = \frac{X(s)}{F(s)} = \frac{1}{ms^2 + bs +k}$$
+A structured perturbation might take each of these physical parameters $m$, $b$, and $k$ and attribute a likely range or tolerance to their value:
+$$ \mathcal{P} = \left\{ \frac{1}{(m+e_m)s^2 + (b+e_b)s + (k + e_k)} \right\} \text{ : }
+\matrix{m_{min} \leq m+e_m \leq m_{max} \\
+b_{min} \leq b +e_b \leq b_{max} \\
+k_{min} \leq k +e_k \leq k_{max}} $$
+where $e_m$ is the difference between the nominal mass and the actual as-built mass. $e_b$ and $e_k$ follow similar logic. Structured perturbations are easy to use to create perturbed plants: simply pick values for $e_m$, $e_b$, and $e_k$ that are within the allowable bounds and plug them in to create a new, perturbed transfer function. 
+
+	Structured perturbations also require a lot of leg work to create
+
+**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 disk multiplicative perturbation)
 

4 Qualifying Exam/2 Writing/3. QE Research Approach.md

@@ -2,7 +2,7 @@
 title: Research Approach
 allDay: true
 date: 2024-10-10
-completed: null
+completed: 
 type: single
 endDate: 2024-10-22
 ---
@@ -17,4 +17,16 @@ endDate: 2024-10-22
 5.  How can we know if these new plants are in the set of 'controllable' plants?
 6. How are we going to get training data?
 
-Something to justify, why diffusion model as opposed to other generative AI
+Something to justify, why diffusion model as opposed to other generative AI
+
+# First Draft
+## Topic Point 
+### Intro
+**Paragraph 1 - Introduction**
+*Topic:* Generating unstructured perturbations is a difficult problem right now, but is necessary to blah blah blah
+*Point:* This research will use a diffusion generative model to create unstructured perturbations.
+*Discussion*: Talk about the big pictures of what the next sections are
+### The Generative Diffusion Model
+### Using Diffusion to Create New Plants
+### Establishing New Plants are in the Disk
+### Preliminary Results

conflict-files-obsidian-git.md

@@ -0,0 +1,17 @@
+# 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
+```