From c49c4c7bbe54789dd6b36d3c07cd7f3595de9a4f Mon Sep 17 00:00:00 2001
From: Hannes Becher <hannesbecher@gmx.de>
Date: Fri, 22 Jul 2022 13:14:47 +0100
Subject: [PATCH] biasAndPeakCancel

---
 Tetmer/DESCRIPTION  |  2 +-
 Tetmer/R/formulae.R | 18 +++++++++---------
 Tetmer/R/tetmer.R   |  2 +-
 Tetmer/Tetmer.Rproj |  1 +
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Tetmer/DESCRIPTION b/Tetmer/DESCRIPTION
index 1a68550..5b2492a 100644
--- a/Tetmer/DESCRIPTION
+++ b/Tetmer/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: Tetmer
 Type: Package
 Title: Fitting Population Parameters to k-mer Spectra
-Version: 2.2.1
+Version: 2.3.0
 Author: Hannes Becher
 Maintainer: Hannes Becher <hannesbecher@gmail.com>
 Description: A shiny app for fitting population parameters to k-mer spectra generated from whole-genome DNA sequencing data.
diff --git a/Tetmer/R/formulae.R b/Tetmer/R/formulae.R
index 9113bed..94fb9b8 100644
--- a/Tetmer/R/formulae.R
+++ b/Tetmer/R/formulae.R
@@ -1,19 +1,19 @@
 probsDip <- expression(rbind(
-  dnbinom(txmin:txmax, tkcov/tbias*1, mu = tkcov * 1),
-  dnbinom(txmin:txmax, tkcov/tbias*2, mu = tkcov * 2)
+  dnbinom(txmin:txmax, tkcov/tbias, mu = tkcov * 1),
+  dnbinom(txmin:txmax, tkcov/tbias, mu = tkcov * 2)
 ))
 
 probsTri <- expression(rbind(
-  dnbinom(txmin:txmax, tkcov/tbias*1, mu = tkcov * 1),
-  dnbinom(txmin:txmax, tkcov/tbias*2, mu = tkcov * 2),
-  dnbinom(txmin:txmax, tkcov/tbias*3, mu = tkcov * 3)
+  dnbinom(txmin:txmax, tkcov/tbias, mu = tkcov * 1),
+  dnbinom(txmin:txmax, tkcov/tbias, mu = tkcov * 2),
+  dnbinom(txmin:txmax, tkcov/tbias, mu = tkcov * 3)
 ))
 
 probsTet <- expression(rbind(
-  dnbinom(txmin:txmax, tkcov/tbias*1, mu = tkcov * 1),
-  dnbinom(txmin:txmax, tkcov/tbias*2, mu = tkcov * 2),
-  dnbinom(txmin:txmax, tkcov/tbias*3, mu = tkcov * 3),
-  dnbinom(txmin:txmax, tkcov/tbias*4, mu = tkcov * 4)
+  dnbinom(txmin:txmax, tkcov/tbias, mu = tkcov * 1),
+  dnbinom(txmin:txmax, tkcov/tbias, mu = tkcov * 2),
+  dnbinom(txmin:txmax, tkcov/tbias, mu = tkcov * 3),
+  dnbinom(txmin:txmax, tkcov/tbias, mu = tkcov * 4)
 ))
 
 
diff --git a/Tetmer/R/tetmer.R b/Tetmer/R/tetmer.R
index 75def14..d633d54 100644
--- a/Tetmer/R/tetmer.R
+++ b/Tetmer/R/tetmer.R
@@ -181,7 +181,7 @@ tet.server <- function(input, output) {
 
 
 makeUI <- function(){
-  fluidPage(titlePanel("Tetmer v2.2.0"),
+  fluidPage(titlePanel("Tetmer v2.3.0"),
                     "Fitting population paramters to k-mer spectra (by Hannes Becher)",
                     fluidRow(
                       column(8, plotOutput('plot')),
diff --git a/Tetmer/Tetmer.Rproj b/Tetmer/Tetmer.Rproj
index 497f8bf..bb57690 100644
--- a/Tetmer/Tetmer.Rproj
+++ b/Tetmer/Tetmer.Rproj
@@ -17,4 +17,5 @@ StripTrailingWhitespace: Yes
 
 BuildType: Package
 PackageUseDevtools: Yes
+PackageCleanBeforeInstall: Yes
 PackageInstallArgs: --no-multiarch --with-keep.source