further merge errors corrected

ChangeLog

@@ -336,7 +336,7 @@
 
 version 2.1.0
 
-171010 Martin Mann :
+171010 Martin Raden :
  * README.md :
    + explicit seed description
  * AccessibilityVrna :
@@ -346,7 +346,7 @@ version 2.1.0
      * BUGFIX : only check for block-constraint for region ends (is allowed to
        contain a blocked subregion)
 
-171009 Martin Mann :
+171009 Martin Raden :
  * tests/*BasePair_test :
    * explicit use of std::abs (should fix test error of github issue #91)
    * BUGFIX: test values wrong (were derived from rounded values)
@@ -380,15 +380,15 @@ version 2.1.0
    + test checkSeedEncoding()
    + test SeedData() parsing
 
-171006 Martin Mann :
+171006 Martin Raden :
  * AccessibilityVrna :
    * fillByRNAup() :
      * BUGFIX : have to check whether region is blocked not if constrained
  * AccessibilityBasePair :
  * AccessibilityFromStream :
    + "not implemented" notification if accessibility constraints given
 
-171005 Martin Mann :
+171005 Martin Raden :
  * configure.ac :
    + disable-log-coloring : sets INTARNA_LOG_COLORING for console log coloring
  * bin/IntaRNA :
@@ -397,7 +397,7 @@ version 2.1.0
    + callbackForStorage() : callback function to use new VRNA API
    * fillByRNAplfold() : window-based PU computation via new VRNA API
 
-171004 Martin Mann :
+171004 Martin Raden :
  * configure.ac :
    * bump minimal ViennaRNA version to 2.4.1 (for constraint interface) 
    * bump easylogging++ version to 9.95
@@ -411,14 +411,14 @@ version 2.1.0
 
 version 2.0.5
 
-170926 Martin Mann :
+170926 Martin Raden :
  * IntaRNA/PredictorMfe4d :
    * getNextBest() : BUGFIX : matrix access was not using interaction end 
      distance and interaction data was wrongly storing distance as right index;
      this was causing segfaults when requesting more than one prediction output
      (thanks to Rick Gelhausen)
 
-170926 Martin Mann :
+170926 Martin Raden :
  * IntaRNA/PredictorMfe4dSeed :
  * IntaRNA/PredictorMfe2dHeuristicSeed :
    + updateOptima() to disable predTracker updates when fillHybridE() of super
@@ -429,13 +429,13 @@ version 2.0.5
 
 version 2.0.4
 
-170706 Martin Mann :
+170706 Martin Raden :
  * IntaRNA/OutputHandlerCsv :
    + E_hybrid : hybrid-only energy = E - ED1 - ED2
    + E_norm : length-normalized energy = E / ln( length1*length2 )
    + E_hybridNorm : length-normalized hybrid-only energy =  E_hybrid / ln(l1*l2)
 
-170705 Martin Mann :
+170705 Martin Raden :
  * perl/Intarna*.pl :
    * shebang corrected (thanks to Patrick Wright)
 

Makefile.am

@@ -26,6 +26,7 @@ tests: all
 	@echo
 	@echo " => compiling and running tests ... will take a while ..."
 	@echo
+	@$(MAKE) clean-checkPROGRAMS -s -C tests
 	@$(MAKE) check -s -C tests
 
 test: tests