Preprint

aphalo · May 30, 2024 · 430240a · 430240a
1 parent a818d74
commit 430240a
Show file tree

Hide file tree

Showing 23 changed files with 205,689 additions and 167,527 deletions.
diff --git a/appendixes.prj b/appendixes.prj
@@ -3,14 +3,23 @@
 1
 1
 1
+<<<<<<< Updated upstream
 using-r-main-crc.Rnw
 33
+=======
+using-r-main-crc.tex
+34
+>>>>>>> Stashed changes
 15
 0
 
 using-r-main-crc.Rnw
 TeX:RNW:UTF-8
+<<<<<<< Updated upstream
 402653186 0 189 20 189 25 6074 -1 6522 208 1 1 458 5481 1 906 254 255 -1 0 0 33 1 0 25 189  0 -1 0
+=======
+268435458 0 5 1 6 1 6074 -1 6522 208 1 1 146 174 1 906 254 255 -1 0 0 33 1 0 1 6  0 -1 0
+>>>>>>> Stashed changes
 R.plotting.Rnw
 TeX:RNW
 17838075 2 -1 107594 -1 107597 380 380 1366 1438 1 1 159 667 -1 -1 0 0 115133 -1 -1 115133 1 0 107597 -1  0 -1 0
@@ -53,12 +62,21 @@ TeX:RNW
 R.learning.Rnw
 TeX:UK
 17837307 0 -1 23277 -1 23277 190 190 1320 1137 1 1 393 1305 -1 -1 0 0 41 1 1 41 1 0 23277 -1  0 -1 0
+<<<<<<< Updated upstream
 cloudindex.idx
 TeX:AUX
 269495538 0 0 1 1666 1 114 114 1612 1051 0 0 34 1305 -1 -1 0 0 -1 -1 -1 -1 1 0 1 1666  0 0 0
+=======
+F:\aphalo\research-data\data-weather\minilab-1008\minilab-2024-05-24\may24-17.07h.csv
+DATA
+273678578 0 7 1 7 1 114 114 1612 1051 1 0 125 203 -1 -1 0 0 -1 -1 -1 -1 1 0 1 7  0 0 0
+>>>>>>> Stashed changes
 using-r-main-crc.tex
 TeX
-269495547 0 -1 729593 -1 729785 152 152 1581 1098 1 1 302 377 -1 -1 0 0 49 -1 -1 49 1 0 729785 -1  0 -1 0
+403713275 1 -1 103 -1 200 152 152 1581 1098 1 1 146 174 -1 -1 0 0 49 -1 -1 49 1 0 200 -1  0 -1 0
+cloudindex.idx
+TeX:AUX
+269495538 0 0 1 1666 1 114 114 1612 1051 0 0 34 1305 -1 -1 0 0 -1 -1 -1 -1 1 0 1 1666  0 0 0
 from-Rob-Calver\Krantz_AuthoredBook_v1.18\Krantz_AuthoredBook_v1.18\krantz.cls
 TeX:STY:UNIX
 269593842 0 1202 39 11 20 342 342 1487 1288 1 0 372 319 -1 -1 0 0 -1 -1 -1 -1 1 0 20 11  0 0 0
@@ -108,7 +126,11 @@ R.as.calculator.tex
 TeX
 269496315 0 -1 0 -1 0 76 76 1769 997 1 1 148 0 -1 -1 0 0 -1 -1 -1 -1 1 0 0 -1  0 0 0
 
+<<<<<<< Updated upstream
 *using-r-main-crc.Rnw
+=======
+*using-r-main-crc.tex
+>>>>>>> Stashed changes
 >
 *rbooks.bib
 *references.bib

diff --git a/appendixes.prj.bak b/appendixes.prj.bak
@@ -3,6 +3,7 @@
 1
 1
 1
+<<<<<<< Updated upstream
 using-r-main-crc.Rnw
 33
 15
@@ -11,6 +12,19 @@ using-r-main-crc.Rnw
 using-r-main-crc.Rnw
 TeX:RNW:UTF-8
 402653186 0 189 20 189 25 6074 -1 6522 208 1 1 458 232 1 906 254 255 -1 0 0 33 1 0 25 189  0 -1 0
+=======
+using-r-main-crc.tex
+34
+16
+1
+
+using-r-main-crc.Rnw
+TeX:RNW:UTF-8
+2 0 5 1 6 1 6074 -1 6522 208 1 1 146 174 1 906 254 255 -1 0 0 33 1 0 1 6  0 -1 0
+F:\aphalo\research-data\data-weather\minilab-1008\minilab-2024-05-24\may24-17.07h.csv
+DATA
+273678578 0 60007 65 60007 65 114 114 1612 1051 1 0 957 1740203 -1 -1 0 0 -1 -1 -1 -1 1 0 65 60007  0 0 0
+>>>>>>> Stashed changes
 R.plotting.Rnw
 TeX:RNW
 17838075 2 -1 107594 -1 107597 380 380 1366 1438 1 1 159 667 -1 -1 0 0 115133 -1 -1 115133 1 0 107597 -1  0 -1 0
@@ -53,12 +67,18 @@ TeX:RNW
 R.learning.Rnw
 TeX:UK
 17837307 0 -1 23277 -1 23277 190 190 1320 1137 1 1 393 1305 -1 -1 0 0 41 1 1 41 1 0 23277 -1  0 -1 0
+<<<<<<< Updated upstream
 cloudindex.idx
 TeX:AUX
 269495538 0 0 1 1666 1 114 114 1612 1051 0 0 34 1305 -1 -1 0 0 -1 -1 -1 -1 1 0 1 1666  0 0 0
+=======
+>>>>>>> Stashed changes
 using-r-main-crc.tex
 TeX
-269495547 0 -1 729593 -1 729785 152 152 1581 1098 1 1 302 377 -1 -1 0 0 49 -1 -1 49 1 0 729785 -1  0 -1 0
+403713275 1 -1 103 -1 200 152 152 1581 1098 1 1 146 174 -1 -1 0 0 49 -1 -1 49 1 0 200 -1  0 -1 0
+cloudindex.idx
+TeX:AUX
+269495538 0 0 1 1666 1 114 114 1612 1051 0 0 34 1305 -1 -1 0 0 -1 -1 -1 -1 1 0 1 1666  0 0 0
 from-Rob-Calver\Krantz_AuthoredBook_v1.18\Krantz_AuthoredBook_v1.18\krantz.cls
 TeX:STY:UNIX
 269593842 0 1202 39 11 20 342 342 1487 1288 1 0 372 319 -1 -1 0 0 -1 -1 -1 -1 1 0 20 11  0 0 0
@@ -108,7 +128,11 @@ R.as.calculator.tex
 TeX
 269496315 0 -1 0 -1 0 76 76 1769 997 1 1 148 0 -1 -1 0 0 -1 -1 -1 -1 1 0 0 -1  0 0 0
 
+<<<<<<< Updated upstream
 *using-r-main-crc.Rnw
+=======
+*using-r-main-crc.tex
+>>>>>>> Stashed changes
 >
 *rbooks.bib
 *references.bib