diff --git a/DESCRIPTION b/DESCRIPTION index 4dcbafd..23a548e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: RFishBC -Version: 0.0.12.9000 -Date: 2018-10-4 +Version: 0.0.13 +Date: 2018-10-6 Title: Back-Calculation of Fish Length Authors@R: person("Derek","Ogle", email="derek@derekogle.com", diff --git a/NEWS.md b/NEWS.md index 9e16063..b0e8bb8 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,9 +1,9 @@ -# RFishBC 0.0.12.9000 ongoing +# RFishBC 0.0.13 6-Oct-18 * `combineData()`: Modified. Changed so that an age-0 fish with all plus-growth is still included in the returned data.frame when `deletePlusGrowth=TRUE` (the `ann` and `rad` variables will both be `NA`). Thanks to Ben Neely. * `digitizeRadii()`: Modified. Removed restriction that one point be selected as an annulus, which allows for handling age-0 fish (addresses [#25](https://github.com/droglenc/RFishBC/issues/25); thanks to Ben Neely for the suggestion). Removed the `q` and `r` button equivalencies for `f` and `d`. Added the ability for the user to start over (resulting in no file to be written, but the current image stays live; uses the `z` key) (addresses [#22](https://github.com/droglenc/RFishBC/issues/22); thanks to Ben Neely for the suggestion). Added the ability for the user to abort a processing (resulting in no file to be written and moving to the next image if using multiple images; uses the `q` key) (addresses [#24](https://github.com/droglenc/RFishBC/issues/24); thanks to Ben Neely for the suggestion). * `findScalingFactor()`: Modified. Changed to allow the user to abort or restart the process, similar to for `digitizeRadii()`. -# RFishBC 0.0.12 ongoing +# RFishBC 0.0.12 3-Oct-18 * Excluded many of the interactive lines from the coverage statistics. Updated other tests (aiming for comprehensiveness). * Started a cran-comments document to begin preparations for a CRAN release. * Added `Encoding: UTF-8` to DESCRIPTION. diff --git a/docs/articles/BCCalc/BCCalc.html b/docs/articles/BCCalc/BCCalc.html index a574723..6314ad8 100644 --- a/docs/articles/BCCalc/BCCalc.html +++ b/docs/articles/BCCalc/BCCalc.html @@ -30,7 +30,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 diff --git a/docs/articles/BCCalc/BCCalc_old.html b/docs/articles/BCCalc/BCCalc_old.html index 0e0f479..b3a0ab2 100644 --- a/docs/articles/BCCalc/BCCalc_old.html +++ b/docs/articles/BCCalc/BCCalc_old.html @@ -30,7 +30,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 diff --git a/docs/articles/BCIntro/BCIntro.html b/docs/articles/BCIntro/BCIntro.html index 866054f..167676c 100644 --- a/docs/articles/BCIntro/BCIntro.html +++ b/docs/articles/BCIntro/BCIntro.html @@ -30,7 +30,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 diff --git a/docs/articles/MeasureRadii/collectRadiiData.html b/docs/articles/MeasureRadii/collectRadiiData.html index dbcbad3..37a4ffc 100644 --- a/docs/articles/MeasureRadii/collectRadiiData.html +++ b/docs/articles/MeasureRadii/collectRadiiData.html @@ -30,7 +30,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 diff --git a/docs/articles/MeasureRadii/seeRadiiData.html b/docs/articles/MeasureRadii/seeRadiiData.html index c809d1e..53522be 100644 --- a/docs/articles/MeasureRadii/seeRadiiData.html +++ b/docs/articles/MeasureRadii/seeRadiiData.html @@ -30,7 +30,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 diff --git a/docs/articles/Workflow/BCWorkflow.html b/docs/articles/Workflow/BCWorkflow.html index a87edc3..4aa1669 100644 --- a/docs/articles/Workflow/BCWorkflow.html +++ b/docs/articles/Workflow/BCWorkflow.html @@ -30,7 +30,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 diff --git a/docs/articles/index.html b/docs/articles/index.html index ef36b2f..121dde7 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -61,7 +61,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 diff --git a/docs/authors.html b/docs/authors.html index 76fb604..8027448 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -61,7 +61,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 @@ -129,13 +129,13 @@

Citation

Ogle DH (2018). RFishBC. -R package version 0.0.12.9000, http://derekogle.com/RFishBC. +R package version 0.0.13, http://derekogle.com/RFishBC. 

@Manual{,
   title = {RFishBC},
   author = {Derek H. Ogle},
   year = {2018},
-  note = {R package version 0.0.12.9000},
+  note = {R package version 0.0.13},
   url = {http://derekogle.com/RFishBC},
 }
diff --git a/docs/index.html b/docs/index.html index 3394664..99df4b3 100644 --- a/docs/index.html +++ b/docs/index.html @@ -33,7 +33,7 @@ RFishBC - 0.0.12.9000 + 0.0.13
diff --git a/docs/news/index.html b/docs/news/index.html index e4c16e4..ab0e013 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -61,7 +61,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 @@ -128,9 +128,9 @@

Changelog

-
+

-RFishBC 0.0.12.9000 ongoing

+RFishBC 0.0.13 6-Oct-18
-
+

-RFishBC 0.0.12 ongoing

+RFishBC 0.0.12 3-Oct-18
  • Excluded many of the interactive lines from the coverage statistics. Updated other tests (aiming for comprehensiveness).
  • Started a cran-comments document to begin preparations for a CRAN release.
    • @@ -380,8 +380,8 @@

    Contents

      -
    • 0.0.12.9000
      • -
    • 0.0.12
      • +
    • 0.0.13
      • +
    • 0.0.12
    • 0.0.11
    • 0.0.10
    • 0.0.9
      • diff --git a/docs/reference/FSA-internals.html b/docs/reference/FSA-internals.html index 9a4aa0a..ee65b1c 100644 --- a/docs/reference/FSA-internals.html +++ b/docs/reference/FSA-internals.html @@ -63,7 +63,7 @@ RFishBC - 0.0.12.9000 + 0.0.13
    diff --git a/docs/reference/RFBCoptions.html b/docs/reference/RFBCoptions.html index 70153ac..07a9358 100644 --- a/docs/reference/RFBCoptions.html +++ b/docs/reference/RFBCoptions.html @@ -64,7 +64,7 @@ RFishBC - 0.0.12.9000 + 0.0.13

diff --git a/docs/reference/RFishBC.html b/docs/reference/RFishBC.html index bfe7be2..bae6cfe 100644 --- a/docs/reference/RFishBC.html +++ b/docs/reference/RFishBC.html @@ -63,7 +63,7 @@ RFishBC - 0.0.12.9000 + 0.0.13
diff --git a/docs/reference/SMBassWB1.html b/docs/reference/SMBassWB1.html index f89ea1d..3da850f 100644 --- a/docs/reference/SMBassWB1.html +++ b/docs/reference/SMBassWB1.html @@ -63,7 +63,7 @@ RFishBC - 0.0.12.9000 + 0.0.13
diff --git a/docs/reference/SMBassWB2.html b/docs/reference/SMBassWB2.html index 4ec27d9..91fe3ab 100644 --- a/docs/reference/SMBassWB2.html +++ b/docs/reference/SMBassWB2.html @@ -63,7 +63,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 diff --git a/docs/reference/StdIntLit.html b/docs/reference/StdIntLit.html index cceff9b..72669fc 100644 --- a/docs/reference/StdIntLit.html +++ b/docs/reference/StdIntLit.html @@ -63,7 +63,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 diff --git a/docs/reference/aStandard.html b/docs/reference/aStandard.html index 4fbf945..1aa31ec 100644 --- a/docs/reference/aStandard.html +++ b/docs/reference/aStandard.html @@ -63,7 +63,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 diff --git a/docs/reference/addRadCap.html b/docs/reference/addRadCap.html index 423dc55..f8cc21b 100644 --- a/docs/reference/addRadCap.html +++ b/docs/reference/addRadCap.html @@ -63,7 +63,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 diff --git a/docs/reference/backCalc.html b/docs/reference/backCalc.html index 2c08e9a..0cbae13 100644 --- a/docs/reference/backCalc.html +++ b/docs/reference/backCalc.html @@ -63,7 +63,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 diff --git a/docs/reference/bcFuns.html b/docs/reference/bcFuns.html index 20e122b..2af4352 100644 --- a/docs/reference/bcFuns.html +++ b/docs/reference/bcFuns.html @@ -63,7 +63,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 @@ -197,7 +197,7 @@

Examp #> if (verbose) DONE("Using the Dahl-Lea model.") #> (Ri/Rcap)*Lcap #> } -#> <environment: 0x0cfd2c10>
bcm1(20,10,40)
#> <U+2714> Using the Dahl-Lea model.
#> [1] 5
+#> <environment: 0x0f18a340>
bcm1(20,10,40)
#> <U+2714> Using the Dahl-Lea model.
#> [1] 5
## Example with dummy length-at-cap, radii-at-cap, and radii-at-age lencap <- c(100,100,100,150,150) radcap <- c(20,20,20,30,30) @@ -207,7 +207,7 @@

Examp #> if (verbose) DONE("Using the Fraser-Lee model with a=",a,".") #> a+(Lcap-a)*(Ri/Rcap) #> } -#> <environment: 0x106f0ad8>

bcm2(lencap,rad,radcap,2) # demonstrated with a=2
#> <U+2714> Using the Fraser-Lee model with a=2.
#> [1] 26.5000 51.0000 75.5000 76.0000 125.3333
+#> <environment: 0x106c0868>
bcm2(lencap,rad,radcap,2) # demonstrated with a=2
#> <U+2714> Using the Fraser-Lee model with a=2.
#> [1] 26.5000 51.0000 75.5000 76.0000 125.3333
diff --git a/docs/reference/digitizeRadii.html b/docs/reference/digitizeRadii.html index d5405c5..c91e2c9 100644 --- a/docs/reference/digitizeRadii.html +++ b/docs/reference/digitizeRadii.html @@ -63,7 +63,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 diff --git a/docs/reference/findScalingFactor.html b/docs/reference/findScalingFactor.html index 7a605f8..8506fe0 100644 --- a/docs/reference/findScalingFactor.html +++ b/docs/reference/findScalingFactor.html @@ -63,7 +63,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 diff --git a/docs/reference/gConvert.html b/docs/reference/gConvert.html index edd2f38..b918f47 100644 --- a/docs/reference/gConvert.html +++ b/docs/reference/gConvert.html @@ -63,7 +63,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 diff --git a/docs/reference/index.html b/docs/reference/index.html index 2578767..4abee77 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -61,7 +61,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 diff --git a/docs/reference/listFiles.html b/docs/reference/listFiles.html index 20c7e78..e67b66e 100644 --- a/docs/reference/listFiles.html +++ b/docs/reference/listFiles.html @@ -63,7 +63,7 @@ RFishBC - 0.0.12.9000 + 0.0.13 diff --git a/docs/reference/showDigitizedImage.html b/docs/reference/showDigitizedImage.html index b66922c..23b7914 100644 --- a/docs/reference/showDigitizedImage.html +++ b/docs/reference/showDigitizedImage.html @@ -63,7 +63,7 @@ RFishBC - 0.0.12.9000 + 0.0.13