Skip to content

Add Kublin pine model; kublin_nor() supports pine (v0.2.0)#13

Merged
JohannesRahlf merged 5 commits into
masterfrom
add-kublin-pine-model
Jun 12, 2026
Merged

Add Kublin pine model; kublin_nor() supports pine (v0.2.0)#13
JohannesRahlf merged 5 commits into
masterfrom
add-kublin-pine-model

Conversation

@JohannesRahlf

Copy link
Copy Markdown
Member

Summary

Adds the newly-fitted Scots pine Kublin (TapeR) model so kublin_nor() now supports spruce and pine. Spruce is unchanged; birch is still not fitted and continues to raise an informative error.

  • R/sysdata.rda — adds kublin_par_lme_pine (the $par.lme from the pine TapeR::TapeR_FIT_LME.f() fit) alongside the existing kublin_par_lme_spruce. Saved as serialization version 2 / bzip2 to match the existing object and stay compatible with Depends: R (>= 2.10).
  • kublin_nor() — routes pine/p/furu/f/2 to the pine model; birch/… now errors with "does not yet support birch"; unrecognized species errors with "spruce or pine".
  • data-raw/sysdata.R — provenance script documenting how sysdata.rda is rebuilt (.Rbuildignored).
  • Docs / tests / version — updated @param sp, the example (now shows pine), the .Rd; tests assert pine resolves to the pine model via every alias and differs from spruce, and that birch errors; bumped to 0.2.0 with a NEWS.md entry (new backwards-compatible feature → minor bump).

Verification

  • spruce Dx=252.985736; pine Dx=253.249937 (distinct pine model); birch → clean error.
  • R CMD check --as-cran: 0 errors, 0 warnings (only the benign "New submission" + local pandoc notes).
  • testthat: 42 pass (was 39).

⚠️ Merge order

This branch is stacked on PR #12 (cran-readiness), so until #12 is merged this PR's diff also shows #12's commits. Please merge #12 first; this PR's diff will then collapse to just the pine changes and can be merged cleanly.

JohannesRahlf and others added 5 commits June 12, 2026 09:37
- plot_taper(): add \value documenting it is called for its plotting side
  effect (CRAN requires \value on all exported functions; this was the only
  one missing it).
- kublin_nor(): add a runnable spruce example (the other exported functions
  already had examples).
- Spelling: add inst/WORDLIST for domain terms, proper nouns, species
  aliases, and foreign-language citation text; add tests/spelling.R and
  'spelling' to Suggests; declare Language: en-US. spell_check is now clean.
- Add NEWS.md and a cran-comments.md submission template (the latter is
  .Rbuildignore'd so it is not shipped in the tarball).

R CMD check --as-cran: 0 errors, 0 warnings; remaining notes are the
expected "New submission" and the environment-only "pandoc not installed"
(absent on CI). testthat: 39 pass.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
citation("taperNOR") now returns a package/software entry first, with
Rahlf as lead author and Hansen as co-author (matching Authors@R and the
agreed credit split: Hansen leads the paper, Rahlf leads the software),
followed by the underlying Hansen et al. (2023) paper and its 2024
correction. Per-entry headers explain which to cite for what.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Use a fixed 2023 (when version 0.1.0 was published alongside the paper)
instead of the current year, so the citation is stable/reproducible and
reflects the actual release year. Update on future version releases.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
The pine par.lme (extracted from TapeR_FIT_LME.f output) is added to
R/sysdata.rda as kublin_par_lme_pine, and kublin_nor() routes pine
(pine/p/furu/f/2) to it. Spruce is unchanged; birch is still not fitted
and continues to raise an informative error.

- R/sysdata.rda: add kublin_par_lme_pine (saved version 2, bzip2, alongside
  the existing kublin_par_lme_spruce).
- data-raw/sysdata.R: provenance script documenting how sysdata.rda is built
  (build-ignored).
- Update kublin_nor() dispatch, @param sp docs, and the example.
- Tests: pine resolves to the pine model via all aliases and differs from
  spruce; birch errors.
- NEWS.md + DESCRIPTION: bump to 0.2.0 (new backwards-compatible feature).

Verified: spruce Dx=25 -> 2.985736, pine Dx=25 -> 3.249937, birch errors.
R CMD check --as-cran: 0 errors/warnings; testthat 42 pass.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
The software citation year now tracks the release year of the version
being cited: version 0.2.0 is released in 2026. Update the year together
with the version on future releases.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@JohannesRahlf JohannesRahlf merged commit a2ba8cc into master Jun 12, 2026
3 checks passed
@JohannesRahlf JohannesRahlf deleted the add-kublin-pine-model branch June 12, 2026 10:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant