Permalink
Commits on Jul 17, 2017
  1. Merge branch 'working'

    jarioksa committed Jul 17, 2017
Commits on Jul 10, 2017
Commits on Jul 8, 2017
Commits on Jul 6, 2017
  1. Merge branch 'norival-master'

    gavinsimpson committed Jul 6, 2017
Commits on Jul 4, 2017
  1. Fix typo in specaccum doc

    norival committed Jul 4, 2017
Commits on Jul 3, 2017
  1. Merge branch 'permutest-crash'

    jarioksa committed Jul 3, 2017
Commits on Jul 2, 2017
  1. tweak error message

    jarioksa committed Jul 2, 2017
Commits on Jul 1, 2017
  1. check permutation matrix in permutest.cca to avoid crashing R

    if 'permutations' has wrong number of columns, R can crash or
    permutations can be wrong. This is a user error, but easily done,
    and we should not crash R but handle user errors more smoothly.
    jarioksa committed Jul 1, 2017
Commits on Jun 28, 2017
  1. Merge branch 'diversity-NA'

    jarioksa committed Jun 28, 2017
  2. slightly faster setting of NA in diversity (+ whitspace)

    issue #239 in github
    jarioksa committed Jun 28, 2017
Commits on Jun 22, 2017
  1. Merge branch 'orditkplot-return'

    jarioksa committed Jun 22, 2017
Commits on Jun 21, 2017
  1. adjust and update help page

    jarioksa committed Jun 21, 2017
  2. less nerdy buttons

    jarioksa committed Jun 21, 2017
Commits on Jun 19, 2017
  1. avoid CRAN warnings on assignments to the global environment

    Now we assign to the parent.frame(). As orditkplot() is only used
    interactively, this is the same as the global environment, but
    passes --as-cran tests.
    jarioksa committed Jun 19, 2017
Commits on Jun 7, 2017
  1. update tests/Examples

    jarioksa committed Jun 7, 2017
  2. Merge branch 'adonis2-fix'

    - further modernization of adonis2 object: Ybar must be in the top
      level, and it is safe to use initDBRDA instead of hand-made Gower
    - anova.ccabyterm failed when all terms were not in scope (e.g., in
      models with interaction terms)
    jarioksa committed Jun 7, 2017
  3. anova.cca by="margin" failed when all terms were not in scope

    anova(cca ~ A1*Management, dune.env) failed because only one term
    A1:Management was in scope, and the same for all other case where
    scope did not include all terms in marginal models (also in adonis2).
    jarioksa committed Jun 7, 2017
  4. Merge branch 'anova-cca-use-permutest'

    - anova.cca by = "terms" uses directly permutest(..., by="term") and
      runs mainly in compiled code (hence is faster)
    - by = "margin" redesigned: no update() of formula, no partial term
      (hence robust against scoping problems), works with NA data
    - by = "axis" uses now 'forward' tests instead of marginal (which
      were biased) at the price of being 3-4 times slower
    - anova.cca lists of models mangled long model formulae
    - adonis2 bug fix: was not adapted to new permutation design
    - model.frame is more robust with subsets
    - model.matrix finds result directly from the result object and avoids
      scoping problems; works even when model.frame fails with scope
    - ordConstrained gained new method="pass" that can refit a model instead
      of update() of formula (which has scoping issues)
    jarioksa committed Jun 7, 2017
  5. Merge pull request #237 from Microbiology/master

    Added average distance matrix function.
    jarioksa committed on GitHub Jun 7, 2017
Commits on Jun 6, 2017
  1. ordConstrained sets method: do not do it again

    jarioksa committed Jun 6, 2017
Commits on Jun 2, 2017
  1. Updated to include BCI count data.

    Microbiology committed Jun 2, 2017
  2. update vegan and cca-object tests reference output

    jarioksa committed Jun 2, 2017
  3. inherits(x, "dbrda") works also with ordConstrained(..., method="pass")

    jarioksa committed Jun 2, 2017
  4. ordConstrained() must set class to make all work with method="pass"

    Partial models gave inconsistent results in dbrda() because
    ordiYbar(..., "CA") did not know input was distance-based. This
    also appeared in anova(..., by="axis") which uses partial models.
    jarioksa committed Jun 2, 2017
  5. ordConstrained gets method information from initialized Y

    earlier we used the supplied method argument, but after allowing
    method = "pass" this was insufficient and made distance-based
    methods wrongly analysed. Consequently anova by = "margin" and
    by = "axis" were wrong. It was also necessary to make permutest.cca
    identify distance-based methods from the x$method item as an
    alternative to class.
    
    This is somewhat hacky, and more fundamental change may be needed
    if ordConstrained(..., method="pass") is  used more widely.
    jarioksa committed Jun 2, 2017
  6. anova.ccalist could scramble long model formulae

    jarioksa committed Jun 2, 2017
  7. update anova.cca help

    jarioksa committed Jun 2, 2017