Skip to content

Commit

Permalink
Release-0.17.0
Browse files Browse the repository at this point in the history
Various improvements to filtering approach.  Including:
- use of synthetic oversampling to balance initial + and - datasets.
- Initial dataset selection improved.
- Splicing signal detection improved.
- Added ability to clean decision boundary using ENN (might improve performance in some cases and computational cost).
- Interface now allows user to control threshold levels to modify filtering sensitivity and precision.
  • Loading branch information
Daniel Mapleson committed Jun 17, 2016
2 parents 9a37525 + 44df64d commit 5106296
Show file tree
Hide file tree
Showing 51 changed files with 3,720 additions and 2,144 deletions.
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],[0.16.0],[daniel.mapleson@tgac.ac.uk],[portcullis],[http://www.tgac.ac.uk])
AC_INIT([portcullis],[0.16.1],[daniel.mapleson@tgac.ac.uk],[portcullis],[http://www.tgac.ac.uk])
AC_CONFIG_SRCDIR([src/portcullis.cc])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
Expand Down
84 changes: 4 additions & 80 deletions data/selftrain_initial_neg.layer3.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,90 +4,14 @@
"operator": "in",
"value": ["N", "S"]
},
"M2-nb_reads": {
"operator": "lte",
"value": 1
},
"M3-nb_dist_aln": {
"operator": "gte",
"value": 2
},
"M4-nb_rel_aln": {
"operator": "eq",
"value": 0
},
"M11-entropy": {
"operator": "lt",
"value": 1.0
},
"M11-entropy.2": {
"operator": "gt",
"value": 2.0
},
"M11-entropy.3": {
"operator": "eq",
"value": 0.0
},
"M12-maxmmes": {
"operator": "lt",
"value": 7
},
"M12-maxmmes.2": {
"operator": "lt",
"value": 10
},
"M12-maxmmes.3": {
"operator": "lt",
"value": 20
},
"M8-max_min_anc": {
"operator": "lt",
"value": 16
},
"Suspect": {
"operator": "eq",
"value": 1
"value": 3.0
},
"PFP": {
"Suspect": {
"operator": "eq",
"value": 1
},
"M13-hamming5p": {
"operator": "lte",
"value": 2
},
"M14-hamming3p": {
"operator": "lte",
"value": 2
},
"M19-mean_mismatches": {
"operator": "gte",
"value": 5.0
},
"M19-mean_mismatches.2": {
"operator": "gte",
"value": 2.0
},
"M20-nb_usrs": {
"operator": "eq",
"value": 0
},
"M20-nb_usrs.2": {
"operator": "eq",
"value": 1
},
"M21-nb_msrs": {
"operator": "gte",
"value": 1
},
"M22-rel2raw": {
"operator": "lt",
"value": 0.9
},
"M22-rel2raw.2": {
"operator": "eq",
"value": 0.0
}
}
},
"expression": "( Suspect & M11-entropy.2 )"
"expression": "( M1-canonical_ss & Suspect & M11-entropy )"
}
84 changes: 2 additions & 82 deletions data/selftrain_initial_neg.layer4.json
Original file line number Diff line number Diff line change
@@ -1,93 +1,13 @@
{
"parameters": {
"M1-canonical_ss": {
"operator": "in",
"value": ["N", "S"]
},
"M2-nb_reads": {
"operator": "lte",
"value": 1
},
"M3-nb_dist_aln": {
"operator": "gte",
"value": 2
},
"M4-nb_rel_aln": {
"operator": "eq",
"value": 0
},
"M11-entropy": {
"operator": "lt",
"value": 1.0
},
"M11-entropy.2": {
"operator": "gt",
"value": 2.0
},
"M11-entropy.3": {
"operator": "eq",
"value": 0.0
},
"M12-maxmmes": {
"operator": "lt",
"value": 7
},
"M12-maxmmes.2": {
"operator": "lt",
"value": 10
},
"M12-maxmmes.3": {
"operator": "lt",
"value": 20
},
"M8-max_min_anc": {
"operator": "lt",
"value": 16
},
"Suspect": {
"operator": "eq",
"value": 1
},
"PFP": {
"operator": "eq",
"value": 1
},
"M13-hamming5p": {
"operator": "lte",
"value": 2
},
"M14-hamming3p": {
"operator": "lte",
"value": 2
},
"M19-mean_mismatches": {
"operator": "gte",
"value": 5.0
},
"M19-mean_mismatches.2": {
"operator": "gte",
"value": 2.0
},
"M20-nb_usrs": {
"operator": "eq",
"value": 0
},
"M20-nb_usrs.2": {
"operator": "eq",
"value": 1
},
"M21-nb_msrs": {
"operator": "gte",
"value": 1
},
"M22-rel2raw": {
"operator": "lt",
"value": 0.9
},
"M22-rel2raw.2": {
"operator": "eq",
"value": 0.0
"value": 0.5
}
},
"expression": "( M12-maxmmes & M22-rel2raw )"
"expression": "( M12-maxmmes & M22-rel2raw )"
}
84 changes: 2 additions & 82 deletions data/selftrain_initial_neg.layer5.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,92 +2,12 @@
"parameters": {
"M1-canonical_ss": {
"operator": "in",
"value": ["N", "S"]
"value": ["N"]
},
"M2-nb_reads": {
"operator": "lte",
"value": 1
},
"M3-nb_dist_aln": {
"operator": "gte",
"value": 2
},
"M4-nb_rel_aln": {
"operator": "eq",
"value": 0
},
"M11-entropy": {
"operator": "lt",
"value": 1.0
},
"M11-entropy.2": {
"operator": "gt",
"value": 2.0
},
"M11-entropy.3": {
"operator": "eq",
"value": 0.0
},
"M12-maxmmes": {
"operator": "lt",
"value": 7
},
"M12-maxmmes.2": {
"operator": "lt",
"value": 10
},
"M12-maxmmes.3": {
"operator": "lt",
"value": 20
},
"M8-max_min_anc": {
"operator": "lt",
"value": 16
},
"Suspect": {
"operator": "eq",
"value": 1
},
"PFP": {
"operator": "eq",
"value": 1
},
"M13-hamming5p": {
"operator": "lte",
"value": 2
},
"M14-hamming3p": {
"operator": "lte",
"value": 2
},
"M19-mean_mismatches": {
"operator": "gte",
"value": 5.0
},
"M19-mean_mismatches.2": {
"operator": "gte",
"value": 2.0
},
"M20-nb_usrs": {
"operator": "eq",
"value": 0
},
"M20-nb_usrs.2": {
"operator": "eq",
"value": 1
},
"M21-nb_msrs": {
"operator": "gte",
"value": 1
},
"M22-rel2raw": {
"operator": "lt",
"value": 0.9
},
"M22-rel2raw.2": {
"operator": "eq",
"value": 0.0
}
},
"expression": "( M1-canonical_ss & M22-rel2raw.2 )"
"expression": "( M1-canonical_ss & M22-rel2raw )"
}
86 changes: 3 additions & 83 deletions data/selftrain_initial_neg.layer6.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,91 +3,11 @@
"M1-canonical_ss": {
"operator": "in",
"value": ["N", "S"]
},
"M2-nb_reads": {
"operator": "lte",
"value": 1
},
"M3-nb_dist_aln": {
"operator": "gte",
"value": 2
},
"M4-nb_rel_aln": {
"operator": "eq",
"value": 0
},
"M11-entropy": {
"operator": "lt",
"value": 1.0
},
"M11-entropy.2": {
"operator": "gt",
"value": 2.0
},
"M11-entropy.3": {
"operator": "eq",
"value": 0.0
},
"M12-maxmmes": {
"operator": "lt",
"value": 7
},
"M12-maxmmes.2": {
"operator": "lt",
"value": 10
},
"M12-maxmmes.3": {
"operator": "lt",
"value": 20
},
"M8-max_min_anc": {
"operator": "lt",
"value": 16
},
"Suspect": {
"operator": "eq",
"value": 1
},
},
"PFP": {
"operator": "eq",
"value": 1
},
"M13-hamming5p": {
"operator": "lte",
"value": 2
},
"M14-hamming3p": {
"operator": "lte",
"value": 2
},
"M19-mean_mismatches": {
"operator": "gte",
"value": 5.0
},
"M19-mean_mismatches.2": {
"operator": "gte",
"value": 2.0
},
"M20-nb_usrs": {
"operator": "eq",
"value": 0
},
"M20-nb_usrs.2": {
"operator": "eq",
"value": 1
},
"M21-nb_msrs": {
"operator": "gte",
"value": 1
},
"M22-rel2raw": {
"operator": "lt",
"value": 0.9
},
"M22-rel2raw.2": {
"operator": "eq",
"value": 0.0
}
}
},
"expression": "( PFP )"
"expression": "( M1-canonical_ss & PFP )"
}
Loading

0 comments on commit 5106296

Please sign in to comment.