2020/05/11-13:00:25 (Linux elcattivo.molgen.mpg.de unknown)

pbenner · May 11, 2020 · 1f6be49 · 1f6be49
1 parent 8589158
commit 1f6be49
Show file tree

Hide file tree

Showing 7 changed files with 170 additions and 1,087 deletions.
diff --git a/makefile b/makefile
@@ -1,5 +1,5 @@
 
-VERSION   = 1.2.2
+VERSION   = 1.2.3
 FILES     = modhmm.go $(filter-out %_gen.go %_test.go modhmm.go,$(wildcard *.go))
 FILES_DEP = modhmm.go $(filter-out          %_test.go modhmm.go,$(wildcard *.go config/*.go))
 GOBIN     = $(shell echo $${GOPATH}/bin)

diff --git a/modhmm_chromatin_state_classifiers.go b/modhmm_chromatin_state_classifiers.go
@@ -191,7 +191,7 @@ func (obj ClassifierPA) Eval(s Scalar, x ConstMatrix) error {
 }
 
 func (ClassifierPA) Dims() (int, int) {
-  return 8, 5
+  return 8, 9
 }
 
 func (ClassifierPA) CloneMatrixBatchClassifier() MatrixBatchClassifier {
@@ -213,20 +213,20 @@ func (obj ClassifierEA) Eval(s Scalar, x ConstMatrix) error {
     r *= obj.PeakSym_(x, jH3k27ac, 0, 1)
   }
   { // h3k4me1 peak at any position
-    r *= obj.PeakAnyRange(x, jH3k4me1, 1, 6)
+    r *= obj.PeakAnyRange(x, jH3k4me1, 2, 7)
   }
   { // no h3k4me3 peak at all positions
-    r *= obj.NoPeakRange(x, jH3k4me3, 1, 6)
+    r *= obj.NoPeakAll(x, jH3k4me3)
   }
   { // no control peak at all positions
-    r *= obj.NoPeakRange(x, jControl, 1, 6)
+    r *= obj.NoPeakAll(x, jControl)
   }
   s.SetValue(r)
   return nil
 }
 
 func (ClassifierEA) Dims() (int, int) {
-  return 8, 7
+  return 8, 9
 }
 
 func (ClassifierEA) CloneMatrixBatchClassifier() MatrixBatchClassifier {

diff --git a/modhmm_default.go b/modhmm_default.go