Skip to content

Commit

Permalink
Finish Release-1.1.2
Browse files Browse the repository at this point in the history
IMPORTANT BUG FIX - Previous version had a bug which reduced sensitivity of portcullis filtering output.  This release fixes that.  We strongly recommend updating to this version.

Fixed a compilation bug that occurs with GCC7.

Updated junctools. Now the parser for tabular Portcullis junctions should be more stable, with dynamically calculated indices rather than brittle hard-coded ones
  • Loading branch information
maplesond committed Aug 9, 2018
2 parents 7bf8bdc + 2b8f6b8 commit 8a4323c
Show file tree
Hide file tree
Showing 37 changed files with 1,611 additions and 1,274 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,4 @@ callgrind*
/portcullis.files
/portcullis.includes
/portcullis.creator.user
/conftest.cpp
37 changes: 26 additions & 11 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,32 @@ dist_noinst_SCRIPTS = autogen.sh antigen.sh build_boost.sh
configdir = $(datadir)/portcullis
dist_config_DATA = \
data/default_filter.json \
data/low_juncs_filter.json \
data/selftrain_initial_neg.layer1.json \
data/selftrain_initial_neg.layer2.json \
data/selftrain_initial_neg.layer3.json \
data/selftrain_initial_neg.layer4.json \
data/selftrain_initial_neg.layer5.json \
data/selftrain_initial_neg.layer6.json \
data/selftrain_initial_neg.layer7.json \
data/selftrain_initial_pos.layer1.json \
data/selftrain_initial_pos.layer2.json \
data/selftrain_initial_pos.layer3.json
data/low_juncs_filter.json
balanceddir = $(datadir)/portcullis/balanced
dist_balanced_DATA = \
data/balanced/selftrain_initial_neg.layer1.json \
data/balanced/selftrain_initial_neg.layer2.json \
data/balanced/selftrain_initial_neg.layer3.json \
data/balanced/selftrain_initial_neg.layer4.json \
data/balanced/selftrain_initial_neg.layer5.json \
data/balanced/selftrain_initial_neg.layer6.json \
data/balanced/selftrain_initial_neg.layer7.json \
data/balanced/selftrain_initial_pos.layer1.json \
data/balanced/selftrain_initial_pos.layer2.json \
data/balanced/selftrain_initial_pos.layer3.json

precisedir = $(datadir)/portcullis/precise
dist_precise_DATA = \
data/precise/selftrain_initial_neg.layer1.json \
data/precise/selftrain_initial_neg.layer2.json \
data/precise/selftrain_initial_neg.layer3.json \
data/precise/selftrain_initial_neg.layer4.json \
data/precise/selftrain_initial_neg.layer5.json \
data/precise/selftrain_initial_neg.layer6.json \
data/precise/selftrain_initial_neg.layer7.json \
data/precise/selftrain_initial_pos.layer1.json \
data/precise/selftrain_initial_pos.layer2.json \
data/precise/selftrain_initial_pos.layer3.json

# SRC DIRS
make_dirs=deps/htslib-1.3 deps/ranger-0.3.8 lib src tests scripts
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,5 @@ See AUTHORS file for more details.
Acknowledgements
----------------

Affiliation: The Genome Analysis Centre (TGAC)
Affiliation: The Earlham Institute (EI)
Funding: The Biotechnology and Biological Sciences Research Council (BBSRC)
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Autoconf setup
AC_PREREQ([2.68])
AC_INIT([portcullis],[1.1.1],[[email protected]],[portcullis],[http://www.earlham.ac.uk])
AC_INIT([portcullis],[1.1.2],[[email protected]],[portcullis],[http://www.earlham.ac.uk])
AC_CONFIG_SRCDIR([src/portcullis.cc])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,6 @@
"operator": "in",
"value": ["N"]
},
"nb_rel_aln.1": {
"operator": "gte",
"value": 5
},
"nb_rel_aln.2": {
"operator": "gte",
"value": 1
},
"maxmmes.1": {
"operator": "gte",
"value": 20
},
"maxmmes.2": {
"operator": "gte",
"value": 10
},
"entropy.1": {
"operator": "gt",
"value": 3.0
Expand Down
17 changes: 17 additions & 0 deletions data/precise/selftrain_initial_neg.layer1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"parameters": {
"maxmmes": {
"operator": "lt",
"value": 15
},
"nb_us_aln": {
"operator": "lte",
"value": 1
},
"rel2raw": {
"operator": "eq",
"value": 0
}
},
"expression": "( maxmmes & nb_us_aln & rel2raw )"
}
25 changes: 25 additions & 0 deletions data/precise/selftrain_initial_neg.layer2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"parameters": {
"canonical_ss": {
"operator": "in",
"value": ["N", "S"]
},
"rel2raw": {
"operator": "lt",
"value": 0.5
},
"mean_mismatches": {
"operator": "gte",
"value": 1
},
"maxmmes": {
"operator": "lt",
"value": 15
},
"nb_us_aln": {
"operator": "lte",
"value": 1
}
},
"expression": "( nb_us_aln & maxmmes & rel2raw & ( canonical_ss | mean_mismatches ) )"
}
13 changes: 13 additions & 0 deletions data/precise/selftrain_initial_neg.layer3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"parameters": {
"canonical_ss": {
"operator": "in",
"value": ["N", "S"]
},
"pfp": {
"operator": "eq",
"value": 1
}
},
"expression": "( canonical_ss & pfp )"
}
13 changes: 13 additions & 0 deletions data/precise/selftrain_initial_neg.layer4.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"parameters": {
"maxmmes": {
"operator": "lt",
"value": 15
},
"rel2raw": {
"operator": "lt",
"value": 0.3
}
},
"expression": "( maxmmes & rel2raw )"
}
21 changes: 21 additions & 0 deletions data/precise/selftrain_initial_neg.layer5.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"parameters": {
"nb_rel_aln": {
"operator": "lt",
"value": 1
},
"entropy": {
"operator": "eq",
"value": 0
},
"primary_junc": {
"operator": "eq",
"value": 0
},
"suspicious": {
"operator": "eq",
"value": 1
}
},
"expression": "( nb_rel_aln & entropy & primary_junc & suspicious )"
}
13 changes: 13 additions & 0 deletions data/precise/selftrain_initial_neg.layer6.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"parameters": {
"canonical_ss": {
"operator": "in",
"value": ["N", "S"]
},
"pfp": {
"operator": "eq",
"value": 1
}
},
"expression": "( canonical_ss & pfp )"
}
17 changes: 17 additions & 0 deletions data/precise/selftrain_initial_neg.layer7.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"parameters": {
"rel2raw": {
"operator": "eq",
"value": 0.0
},
"hamming5p": {
"operator": "lte",
"value": 3
},
"hamming3p": {
"operator": "lte",
"value": 3
}
},
"expression": "( rel2raw & hamming5p & hamming3p )"
}
37 changes: 37 additions & 0 deletions data/precise/selftrain_initial_pos.layer1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"parameters": {
"nb_rel_aln": {
"operator": "gte",
"value": 1
},
"maxmmes": {
"operator": "gte",
"value": 8
},
"entropy": {
"operator": "gt",
"value": 1.0
},
"hamming5p": {
"operator": "gte",
"value": 4
},
"hamming3p": {
"operator": "gte",
"value": 4
},
"mean_mismatches": {
"operator": "lte",
"value": 1.0
},
"nb_us_aln": {
"operator": "gte",
"value": 1
},
"rel2raw": {
"operator": "gte",
"value": 0.25
}
},
"expression": "nb_rel_aln & hamming5p & hamming3p & maxmmes & nb_us_aln & mean_mismatches & rel2raw"
}
45 changes: 45 additions & 0 deletions data/precise/selftrain_initial_pos.layer2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"parameters": {
"nb_rel_aln.1": {
"operator": "gte",
"value": 5
},
"nb_rel_aln.2": {
"operator": "gte",
"value": 3
},
"maxmmes.1": {
"operator": "gte",
"value": 20
},
"maxmmes.2": {
"operator": "gt",
"value": 12
},
"hamming5p.1": {
"operator": "gte",
"value": 7
},
"hamming5p.2": {
"operator": "gte",
"value": 9
},
"hamming3p.1": {
"operator": "gte",
"value": 7
},
"hamming3p.2": {
"operator": "gte",
"value": 9
},
"mean_mismatches.1": {
"operator": "lte",
"value": 0
},
"mean_mismatches.2": {
"operator": "lt",
"value": 0.33
}
},
"expression": "( nb_rel_aln.1 & maxmmes.1 ) | ( nb_rel_aln.2 & maxmmes.2 & hamming5p.1 & hamming3p.1 & mean_mismatches.2 ) | ( hamming5p.2 & hamming3p.2 & mean_mismatches.1 )"
}
65 changes: 65 additions & 0 deletions data/precise/selftrain_initial_pos.layer3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{
"parameters": {
"canonical_ss.1": {
"operator": "in",
"value": ["C"]
},
"canonical_ss.2": {
"operator": "in",
"value": ["S"]
},
"canonical_ss.3": {
"operator": "in",
"value": ["N"]
},
"entropy.1": {
"operator": "gt",
"value": 3.0
},
"entropy.2": {
"operator": "gt",
"value": 1.5
},
"hamming5p.1": {
"operator": "gte",
"value": 6
},
"hamming5p.2": {
"operator": "gte",
"value": 7
},
"hamming3p.1": {
"operator": "gte",
"value": 6
},
"hamming3p.2": {
"operator": "gte",
"value": 7
},
"mean_mismatches.1": {
"operator": "eq",
"value": 0
},
"mean_mismatches.2": {
"operator": "lt",
"value": 0.1
},
"nb_us_aln": {
"operator": "gte",
"value": 5
},
"rel2raw.1": {
"operator": "gte",
"value": 0.5
},
"rel2raw.2": {
"operator": "gte",
"value": 0.75
},
"primary_junc": {
"operator": "eq",
"value": 1
}
},
"expression": "(( canonical_ss.1 ) | ( canonical_ss.2 & rel2raw.1 & hamming5p.1 & hamming3p.1 ) | ( canonical_ss.3 & rel2raw.2 & hamming5p.2 & hamming3p.2 & mean_mismatches.1 & entropy.2 )) & (primary_junc)"
}
1 change: 1 addition & 0 deletions deps/boost/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
/project-config.jam.4
*.log
/project-config.jam.5
/project-config.jam.6
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/64.o
/x86.o
1 change: 0 additions & 1 deletion deps/boost/tools/build/src/engine/bootstrap/.gitignore

This file was deleted.

1 change: 1 addition & 0 deletions deps/ranger-0.3.8/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ config.*
/libtool
*.la
/ranger.pc
/conftest.cpp
4 changes: 2 additions & 2 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
# built documents.
#
# The short X.Y version.
version = '1.1.1'
version = '1.1.2'
# The full version, including alpha/beta/rc tags.
release = '1.1.1'
release = '1.1.2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
Loading

0 comments on commit 8a4323c

Please sign in to comment.