Merge pull request #35 from aarontrowbridge/deriv-reimplement

Deriv reimplement
kestrelquantum · Aug 10, 2023 · e12e5df · e12e5df
2 parents d9baae1 + 616237c
commit e12e5df
Show file tree

Hide file tree

Showing 12 changed files with 626 additions and 1,009 deletions.
diff --git a/notes/pico-implementation-details/pico.fdb_latexmk b/notes/pico-implementation-details/pico.fdb_latexmk
@@ -1,7 +1,13 @@
 # Fdb version 3
+<<<<<<< HEAD
+["pdflatex"] 1688260156 "/home/aditya/oc_projects/QuantumCollocation.jl/notes/pico-implementation-details/pico.tex" "pico.pdf" "pico" 1688260156
+  "/etc/texmf/web2c/texmf.cnf" 1661381987 475 c0e671620eb5563b2130f56340a5fde8 ""
+  "/home/aditya/oc_projects/QuantumCollocation.jl/notes/pico-implementation-details/pico.tex" 1688260155 41515 fb5dc28a2b4c07cbe909fc022334310d ""
+=======
 ["pdflatex"] 1690232300 "/home/aaron/projects/JuliaPackages/QuantumCollocation.jl/notes/pico-implementation-details/pico.tex" "pico.pdf" "pico" 1690232300
   "/etc/texmf/web2c/texmf.cnf" 1661381987 475 c0e671620eb5563b2130f56340a5fde8 ""
   "/home/aaron/projects/JuliaPackages/QuantumCollocation.jl/notes/pico-implementation-details/pico.tex" 1690232299 43273 10a462e90cf0bf7f7f6d77cbd66301b0 ""
+>>>>>>> origin
   "/usr/share/texlive/texmf-dist/fonts/map/fontname/texfonts.map" 1577235249 3524 cb3e574dea2d1052e39280babc910dc8 ""
   "/usr/share/texlive/texmf-dist/fonts/tfm/public/amsfonts/cmextra/cmbsy5.tfm" 1246382020 1120 1e8878807317373affa7f7bba4cf2f6a ""
   "/usr/share/texlive/texmf-dist/fonts/tfm/public/amsfonts/cmextra/cmbsy7.tfm" 1246382020 1120 7f9f170e8aa57527ad6c49feafd45d54 ""
@@ -191,10 +197,17 @@
   "/usr/share/texmf/web2c/texmf.cnf" 1644012257 39432 7155514e09a3d69036fac785183a21c2 ""
   "/var/lib/texmf/fonts/map/pdftex/updmap/pdftex.map" 1661382061 166835 3237b25953d3dec94d74e36efc3a402b ""
   "/var/lib/texmf/web2c/pdftex/pdflatex.fmt" 1661382066 1435853 7dc55129da6aefe46d2d311fdea676e1 ""
+<<<<<<< HEAD
+  "pico.aux" 1688260156 2890 fe292c2c830c3fd789711dd39da86405 "pdflatex"
+  "pico.out" 1688260156 2682 60b213b9fa15f63d21d0b695d75a95e9 "pdflatex"
+  "pico.tex" 1688260155 41515 fb5dc28a2b4c07cbe909fc022334310d ""
+  "pico.toc" 1688260156 1465 c72d4d95f20c90171a1e429076586a72 "pdflatex"
+=======
   "pico.aux" 1690232300 2891 afb9be39c57d583b0c0713e927692822 "pdflatex"
   "pico.out" 1690232300 2682 60b213b9fa15f63d21d0b695d75a95e9 "pdflatex"
   "pico.tex" 1690232299 43273 10a462e90cf0bf7f7f6d77cbd66301b0 ""
   "pico.toc" 1690232300 1466 15b83aaba24388fe450dc474735884eb "pdflatex"
+>>>>>>> origin
   (generated)
   "pico.aux"
   "pico.log"

diff --git a/notes/pico-implementation-details/pico.fls b/notes/pico-implementation-details/pico.fls
@@ -1,9 +1,9 @@
-PWD /home/aaron/projects/JuliaPackages/QuantumCollocation.jl/notes/pico-implementation-details
+PWD /home/aditya/oc_projects/QuantumCollocation.jl/notes/pico-implementation-details
 INPUT /etc/texmf/web2c/texmf.cnf
 INPUT /usr/share/texmf/web2c/texmf.cnf
 INPUT /usr/share/texlive/texmf-dist/web2c/texmf.cnf
 INPUT /var/lib/texmf/web2c/pdftex/pdflatex.fmt
-INPUT /home/aaron/projects/JuliaPackages/QuantumCollocation.jl/notes/pico-implementation-details/pico.tex
+INPUT /home/aditya/oc_projects/QuantumCollocation.jl/notes/pico-implementation-details/pico.tex
 OUTPUT pico.log
 INPUT /usr/share/texlive/texmf-dist/tex/latex/base/article.cls
 INPUT /usr/share/texlive/texmf-dist/tex/latex/base/article.cls

diff --git a/notes/pico-implementation-details/pico.log b/notes/pico-implementation-details/pico.log
@@ -1,10 +1,14 @@
+<<<<<<< HEAD
+This is pdfTeX, Version 3.141592653-2.6-1.40.22 (TeX Live 2022/dev/Debian) (preloaded format=pdflatex 2022.8.24)  1 JUL 2023 21:09
+=======
 This is pdfTeX, Version 3.141592653-2.6-1.40.22 (TeX Live 2022/dev/Debian) (preloaded format=pdflatex 2022.8.24)  24 JUL 2023 16:58
+>>>>>>> origin
 entering extended mode
  restricted \write18 enabled.
  file:line:error style messages enabled.
  %&-line parsing enabled.
-**/home/aaron/projects/JuliaPackages/QuantumCollocation.jl/notes/pico-implementation-details/pico.tex
-(/home/aaron/projects/JuliaPackages/QuantumCollocation.jl/notes/pico-implementation-details/pico.tex
+**/home/aditya/oc_projects/QuantumCollocation.jl/notes/pico-implementation-details/pico.tex
+(/home/aditya/oc_projects/QuantumCollocation.jl/notes/pico-implementation-details/pico.tex
 LaTeX2e <2021-11-15> patch level 1
 L3 programming layer <2022-01-21> (/usr/share/texlive/texmf-dist/tex/latex/base/article.cls
 Document Class: article 2021/10/04 v1.4n Standard LaTeX document class
@@ -554,6 +558,17 @@ Package rerunfilecheck Info: File `pico.out' has not changed.
 (rerunfilecheck)             Checksum: 60B213B9FA15F63D21D0B695D75A95E9;2682.
  ) 
 Here is how much of TeX's memory you used:
+<<<<<<< HEAD
+ 9441 strings out of 480171
+ 144732 string characters out of 5894489
+ 475265 words of memory out of 5000000
+ 27175 multiletter control sequences out of 15000+600000
+ 481811 words of font info for 77 fonts, out of 8000000 for 9000
+ 59 hyphenation exceptions out of 8191
+ 68i,21n,77p,600b,338s stack positions out of 5000i,500n,10000p,200000b,80000s
+</usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmbsy10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmbx10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmbx12.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmbx7.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmex10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cmextra/cmex7.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmmi10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmmi5.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmmi7.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmmib10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmr10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmr12.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmr17.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmr5.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmr7.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmss10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmss8.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmsy10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmsy5.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmsy7.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmti10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/symbols/msbm10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/rsfs/rsfs10.pfb>
+Output written on pico.pdf (23 pages, 311996 bytes).
+=======
  21227 strings out of 480171
  399894 string characters out of 5894489
  692100 words of memory out of 5000000
@@ -563,6 +578,7 @@ Here is how much of TeX's memory you used:
  100i,21n,104p,610b,629s stack positions out of 5000i,500n,10000p,200000b,80000s
 </usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmbsy10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmbx10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmbx12.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmbx7.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmex10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cmextra/cmex7.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmmi10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmmi5.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmmi7.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmmib10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmr10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmr12.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmr17.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmr5.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmr7.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmss10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmss8.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmsy10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmsy5.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmsy7.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmti10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/symbols/msbm10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/rsfs/rsfs10.pfb>
 Output written on pico.pdf (24 pages, 314713 bytes).
+>>>>>>> origin
 PDF statistics:
  400 PDF objects out of 1000 (max. 8388607)
  324 compressed objects within 4 object streams

diff --git a/notes/pico-implementation-details/pico.pdf b/notes/pico-implementation-details/pico.pdf
diff --git a/notes/pico-implementation-details/pico.synctex.gz b/notes/pico-implementation-details/pico.synctex.gz