test

.gitignore

@@ -1,8 +1,8 @@
 .obsidian/plugins/obsidian-pandoc-reference-list/data.json
 .obsidian/workspace.json
-
+.sessions
 
 
 
 # Ignore Smart Environment folder
-.smart-env
+.smart-env

.sessions/Thesis_Notes.vim

@@ -3,7 +3,11 @@ let s:so_save = &g:so | let s:siso_save = &g:siso | setg so=0 siso=0 | setl so=-
 let v:this_session=expand("<sfile>:p")
 silent only
 silent tabonly
+<<<<<<< HEAD
+cd ~/Documents/Dane\'s\ Vault/5\ Thesis
+=======
 cd ~/Documents/Dane\'s\ Vault
+>>>>>>> origin/master
 if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == ''
   let s:wipebuf = bufnr('%')
 endif
@@ -13,6 +17,15 @@ if &shortmess =~ 'A'
 else
   set shortmess=aoO
 endif
+<<<<<<< HEAD
+badd +16 4\ Meetings/DGC_DAS_328.md
+badd +32 5\ Resources/Literature_Reviews/A\ Review\ of\ Formal\ Methods\ applied\ to\ Machine\ Learning.md
+argglobal
+%argdel
+edit 5\ Resources/Literature_Reviews/A\ Review\ of\ Formal\ Methods\ applied\ to\ Machine\ Learning.md
+argglobal
+balt 4\ Meetings/DGC_DAS_328.md
+=======
 badd +16 5\ Thesis/4\ Meetings/DGC_DAS_328.md
 badd +4 5\ Thesis/5\ Resources/Literature_Reviews/A\ Review\ of\ Formal\ Methods\ applied\ to\ Machine\ Learning.md
 argglobal
@@ -20,6 +33,7 @@ argglobal
 edit 5\ Thesis/5\ Resources/Literature_Reviews/A\ Review\ of\ Formal\ Methods\ applied\ to\ Machine\ Learning.md
 argglobal
 balt 5\ Thesis/4\ Meetings/DGC_DAS_328.md
+>>>>>>> origin/master
 setlocal fdm=manual
 setlocal fde=0
 setlocal fmr={{{,}}}
@@ -30,12 +44,21 @@ setlocal fdn=20
 setlocal fen
 silent! normal! zE
 let &fdl = &fdl
+<<<<<<< HEAD
+let s:l = 11 - ((10 * winheight(0) + 27) / 55)
+if s:l < 1 | let s:l = 1 | endif
+keepjumps exe s:l
+normal! zt
+keepjumps 11
+normal! 058|
+=======
 let s:l = 13 - ((12 * winheight(0) + 36) / 73)
 if s:l < 1 | let s:l = 1 | endif
 keepjumps exe s:l
 normal! zt
 keepjumps 13
 normal! 0
+>>>>>>> origin/master
 tabnext 1
 if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal'
   silent exe 'bwipe ' . s:wipebuf

5 Thesis/5 Resources/Literature_Reviews/A Review of Formal Methods applied to Machine Learning.md

@@ -11,3 +11,26 @@ This review seems to talk a good bit about that.
 than other types of programming. Things such as computer vision and decision
 making are very difficult to program manually relative to their ML counterpart.
 
+<<<<<<< HEAD
+- Abstract interpretation can connect different formal methods that otherwise
+would seem disjoint, according to these authors.
+
+- They spend a lot of pages (~15) on *formal methods for neural networks*. 
+There are two kinds.
+
+    - **Complete Formal Methods** are sound and complete, and can provide 
+    counterexamples where appropriate. That being said, they are not usually 
+    sound on floating point arithmetic and often neglect rounding errors.
+
+    - **Incomplete Formal Methods** are generally able to scale to larger 
+    neural networks, and are often sound, but generally suffer from false 
+    positives.
+
+- In comparison, they spend 2 pages on support vector machines and decision
+trees :( What did they ever do to you man!
+
+- They also mention that formal methods for data preparation and training are
+very much works in progress.
+
+=======
+>>>>>>> origin/master

900s Calendars/Research/2025-04-02 Canonical Talk NSH 3305 CMU.md

@@ -0,0 +1,8 @@
+---
+title: Canonical Talk NSH 3305 CMU
+allDay: false
+startTime: 12:00
+endTime: 13:00
+date: 2025-04-02
+completed: null
+---

conflict-files-obsidian-git.md

@@ -0,0 +1,18 @@
+# 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: .sessions/Thesis_Notes.vim
+- [[A Review of Formal Methods applied to Machine Learning]]
+
+# 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
+```