Skip to content

Commit ca65c1f

Browse files
committed
updates to lit and dataprep
this is actually on the correct branch
1 parent 438575e commit ca65c1f

2 files changed

Lines changed: 47 additions & 5 deletions

File tree

inst/literatur.bib

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,47 @@ @article{weissova_HinterlandNikaiaNicaea_2019
4242
}
4343

4444

45+
@article{ratcliffe_Aoristicanalysisspatial_2000,
46+
title = {Aoristic analysis: the spatial interpretation of unspecific temporal events},
47+
shorttitle = {Aoristic analysis},
48+
author = {Ratcliffe, Jerry H.},
49+
date = {2000-10},
50+
journaltitle = {International Journal of Geographical Information Science},
51+
volume = {14},
52+
pages = {669--679},
53+
doi = {10.1080/136588100424963},
54+
number = {7}
55+
}
56+
57+
58+
59+
@article{orton_CatchUnitResearch_2017,
60+
title = {Catch Per Unit Research Effort: Sampling Intensity, Chronological Uncertainty, and the Onset of Marine Fish Consumption in Historic London},
61+
shorttitle = {Catch Per Unit Research Effort},
62+
author = {Orton, David and Morris, James and Pipe, Alan},
63+
date = {2017-01-20},
64+
journaltitle = {Open Quaternary},
65+
volume = {3},
66+
pages = {1},
67+
doi = {10.5334/oq.29}
68+
}
69+
70+
@incollection{johnson_AoristicAnalysisSeeds_2004,
71+
ids = {:unknunknown\_AoristicAnalysisSeeds\_2004},
72+
title = {Aoristic Analysis: Seeds of a New Approach to Mapping Archaeological Distributions through Time},
73+
booktitle = {2003 - Enter the Past. The E-way into the four Dimensions of Cultural Heritage. CAA 2003. Computer Applications and Quantitative Methods in Archaeology},
74+
author = {Johnson, I.},
75+
editor = {B\"orner, W. and Goriany, M.},
76+
date = {2004},
77+
publisher = {Archaeopress},
78+
location = {Oxford},
79+
url = {https://publikationen.uni-tuebingen.de/xmlui/handle/10900/60663}
80+
}
81+
82+
83+
84+
85+
86+
4587

4688
@Comment{jabref-meta: databaseType:bibtex;}

vignettes/data_preparation.Rmd

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,8 @@ knitr::kable(na.omit(inscriptions)[sample(1:nrow(na.omit(inscriptions)), 15),c(6
323323

324324
We can now make a 'test run' using datplot with the stepsize-value set to 5 in order to save as much time as possible[^3] and check for errors first. We have to select exactly 4 columns in the correct order of: Identifier, Grouping Variable, Minimum Dating, Maximum Dating. We transform the output from the pipe operator to a `data.frame` before handing it to `datstepts()`, as **datplot** needs this format.
325325

326-
[^3]: Using different stepsizes is a bit of an artifact left over from a less efficient version of datplot, where is processing would take more than a minute if stepsize was set to 1, so I would usually start out with 100 or 25 just to look for errors and problems. This, however, is technically not necessary in any way. The function now works faster, though there is room for improvement, as it may still take up to 5 seconds or so.
326+
327+
[^3]: Using different stepsizes is a bit of an artifact left over from a less efficient version of datplot, where is processing would take more than a minute if stepsize was set to 1, so I would usually start out with 100 or 25 just to look for errors and problems and to not lose much time. This, however, is technically not necessary in any way. The function now works faster, though there is a lot of room for improvement, as it may still take several seconds or longer, but generally not several minutes. We determined that the feature might still be useful, and therefore it was not removed.
327328

328329
```{r warning = TRUE, message = TRUE, out.lines = 20}
329330
#inscriptions$
@@ -355,9 +356,9 @@ inscriptions[which(inscriptions$ID == "I_2725"),c("DAT_min", "DAT_max")] <-
355356

356357
Note that `datsteps()` changes the date and proceeds, but warns you of the possibility of errors. It is therefore recommended to check the data mentioned in that warning. As we 'fixed' out data set, we should save it again, so that the same error will not occur twice:
357358

358-
```{r }
359-
write.table(inscriptions, file = "../data-raw/inscriptions.csv",
360-
fileEncoding = "UTF-8", sep = ";", row.names = FALSE)
359+
```{r eval = FALSE}
360+
#write.table(inscriptions, file = "../data-raw/inscriptions.csv",
361+
# fileEncoding = "UTF-8", sep = ";", row.names = FALSE)
361362
```
362363

363364

@@ -400,7 +401,6 @@ library(devtools)
400401
# either
401402
install_github("lsteinmann/datplot") # (redacted)
402403
# or
403-
install_local(path = "../datplot_0.1.0.tar.gz")
404404
install_local(path = "../datplot_x.x.x.tar.gz")
405405
```
406406

0 commit comments

Comments
 (0)