jalview.git
7 years agoJAL-2388 Corrected overview panel behaviour, updated tests
kiramt [Mon, 6 Mar 2017 14:29:58 +0000 (14:29 +0000)]
JAL-2388 Corrected overview panel behaviour, updated tests

7 years agoJAL-2428 separate TreeModel from TreeBuilder/NJTree/AverageDistanceTree
gmungoc [Mon, 6 Mar 2017 09:45:54 +0000 (09:45 +0000)]
JAL-2428 separate TreeModel from TreeBuilder/NJTree/AverageDistanceTree
(first pass)

7 years agoJAL-2429 Fix to ColumnSelection::findColumnPosition
kiramt [Fri, 3 Mar 2017 15:00:11 +0000 (15:00 +0000)]
JAL-2429 Fix to ColumnSelection::findColumnPosition

7 years agoJAL-2428 use BitSet for clusters and done flags
gmungoc [Fri, 3 Mar 2017 10:01:34 +0000 (10:01 +0000)]
JAL-2428 use BitSet for clusters and done flags

7 years agoJAL-2388 Initial removal of hidden cols/seqs out of overview
kiramt [Fri, 3 Mar 2017 09:46:08 +0000 (09:46 +0000)]
JAL-2388 Initial removal of hidden cols/seqs out of overview

7 years agoJAL-2295 tweak order and wording of Superpose menu items and tooltip
gmungoc [Thu, 2 Mar 2017 10:06:13 +0000 (10:06 +0000)]
JAL-2295 tweak order and wording of Superpose menu items and tooltip

7 years agoJAL-2295 make 'Jmol' menu appear; enable/disable Superpose option for
gmungoc [Thu, 2 Mar 2017 09:51:17 +0000 (09:51 +0000)]
JAL-2295 make 'Jmol' menu appear; enable/disable Superpose option for
Chimera

7 years agoJAL-2388 Reverted to previous
kiramt [Wed, 1 Mar 2017 16:40:07 +0000 (16:40 +0000)]
JAL-2388 Reverted to previous

7 years agoJAL-1264 smarter way to skip autocalc'd annotations in asserts
gmungoc [Wed, 1 Mar 2017 15:19:09 +0000 (15:19 +0000)]
JAL-1264 smarter way to skip autocalc'd annotations in asserts

7 years agoMerge branch 'features/JAL-2295setChimeraAttributes' into
gmungoc [Wed, 1 Mar 2017 14:38:50 +0000 (14:38 +0000)]
Merge branch 'features/JAL-2295setChimeraAttributes' into
merges/develop_JAL2295setChimeraAttributes

Conflicts:
src/jalview/ext/rbvi/chimera/ChimeraCommands.java
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
src/jalview/gui/ChimeraViewFrame.java
test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java

7 years agoJAL-2388 Preliminary refactor check-in, does not compile
kiramt [Wed, 1 Mar 2017 08:46:10 +0000 (08:46 +0000)]
JAL-2388 Preliminary refactor check-in, does not compile

7 years agoJAL-1632 'includeGaps' applied to FeatureDistanceModel (needs review)
gmungoc [Tue, 28 Feb 2017 16:53:12 +0000 (16:53 +0000)]
JAL-1632 'includeGaps' applied to FeatureDistanceModel (needs review)

7 years agoJAL-2426 Removal of NPE in conservation thread when closing Jalview
kiramt [Tue, 28 Feb 2017 14:50:10 +0000 (14:50 +0000)]
JAL-2426 Removal of NPE in conservation thread when closing Jalview

7 years agoJAL-2388 Removing sources of non-determinism in unit tests
kiramt [Tue, 28 Feb 2017 14:48:56 +0000 (14:48 +0000)]
JAL-2388 Removing sources of non-determinism in unit tests

7 years agoJAL-2388 First move of endRes etc out of AlignmentViewport (in progress)
kiramt [Tue, 28 Feb 2017 14:48:25 +0000 (14:48 +0000)]
JAL-2388 First move of endRes etc out of AlignmentViewport (in progress)

7 years agoJAL-1632 disable parameters not applicable for score model
gmungoc [Tue, 28 Feb 2017 14:22:38 +0000 (14:22 +0000)]
JAL-1632 disable parameters not applicable for score model

7 years agoJAL-2426 Checks on conservation thread in case we are shutting down
kiramt [Tue, 28 Feb 2017 12:25:11 +0000 (12:25 +0000)]
JAL-2426 Checks on conservation thread in case we are shutting down

7 years agoJAL-838 Javadoc tidy
gmungoc [Tue, 28 Feb 2017 12:09:11 +0000 (12:09 +0000)]
JAL-838 Javadoc tidy

7 years agoJAL-2416 seqspace.scm and PIDDistanceModel replaced by PIDModel
gmungoc [Mon, 27 Feb 2017 19:05:26 +0000 (19:05 +0000)]
JAL-2416 seqspace.scm and PIDDistanceModel replaced by PIDModel

7 years agoJAL-838 ScoreMatrix now respects SimilarityParams!
gmungoc [Mon, 27 Feb 2017 18:55:26 +0000 (18:55 +0000)]
JAL-838 ScoreMatrix now respects SimilarityParams!

7 years agoJAL-838 tests for PID calculation with parameter options
gmungoc [Mon, 27 Feb 2017 18:00:15 +0000 (18:00 +0000)]
JAL-838 tests for PID calculation with parameter options

7 years agoJAL-2388 Make startRes,startSeq,endRes,endSeq private with get/setters
kiramt [Mon, 27 Feb 2017 16:10:21 +0000 (16:10 +0000)]
JAL-2388 Make startRes,startSeq,endRes,endSeq private with get/setters

7 years agoJAL-1632 dialog to calculate either Tree or PCA
gmungoc [Mon, 27 Feb 2017 16:03:43 +0000 (16:03 +0000)]
JAL-1632 dialog to calculate either Tree or PCA

7 years agoJAL-1632 similarity options on TreeChooser panel affect tree by PID
gmungoc [Mon, 27 Feb 2017 14:56:22 +0000 (14:56 +0000)]
JAL-1632 similarity options on TreeChooser panel affect tree by PID

7 years agoJAL-2388 Minor refactoring
kiramt [Mon, 27 Feb 2017 11:45:30 +0000 (11:45 +0000)]
JAL-2388 Minor refactoring

7 years agoJAL-1632 add score model params to PCAModel and PCA constructors
gmungoc [Mon, 27 Feb 2017 10:25:53 +0000 (10:25 +0000)]
JAL-1632 add score model params to PCAModel and PCA constructors

7 years agoJAL-1632 refactored NJTree constructor to include SimilarityParams
gmungoc [Mon, 27 Feb 2017 10:05:50 +0000 (10:05 +0000)]
JAL-1632 refactored NJTree constructor to include SimilarityParams

7 years agoJAL-2388 Unit tests take 2
kiramt [Mon, 27 Feb 2017 09:31:46 +0000 (09:31 +0000)]
JAL-2388 Unit tests take 2

7 years agoJAL-2403 JAL-838 remove unused methods and unneeded public visibility
gmungoc [Mon, 27 Feb 2017 08:58:54 +0000 (08:58 +0000)]
JAL-2403 JAL-838 remove unused methods and unneeded public visibility

7 years agoJAL-838 added 'SeqSpace' PID mode, added parameters to findDistances and
gmungoc [Fri, 24 Feb 2017 18:38:56 +0000 (18:38 +0000)]
JAL-838 added 'SeqSpace' PID mode, added parameters to findDistances and
findSimilarities (not yet acted on!)

7 years agoJAL-1403 preserve range of distance scores for similarity
gmungoc [Fri, 24 Feb 2017 15:24:04 +0000 (15:24 +0000)]
JAL-1403 preserve range of distance scores for similarity

7 years agoJAL-2403 PIDModel added (wip)
gmungoc [Fri, 24 Feb 2017 15:23:14 +0000 (15:23 +0000)]
JAL-2403 PIDModel added (wip)

7 years agoJAL-2403 code tidy
gmungoc [Fri, 24 Feb 2017 15:22:40 +0000 (15:22 +0000)]
JAL-2403 code tidy

7 years agoJAL-1483 PIDModel potential replacement for PIDDistanceModel (and
gmungoc [Fri, 24 Feb 2017 15:21:41 +0000 (15:21 +0000)]
JAL-1483 PIDModel potential replacement for PIDDistanceModel (and
seqspace and Comparison.PID?)

7 years agoJAL-838 first version of PID parameters model
gmungoc [Fri, 24 Feb 2017 15:20:20 +0000 (15:20 +0000)]
JAL-838 first version of PID parameters model

7 years agoJAL-2403 remove unused ScoreMatrix.symmetric
gmungoc [Fri, 24 Feb 2017 10:35:39 +0000 (10:35 +0000)]
JAL-2403 remove unused ScoreMatrix.symmetric

7 years agoJAL-2403 JAL-1483 push 'reverseRange' inside Matrix
gmungoc [Fri, 24 Feb 2017 10:08:03 +0000 (10:08 +0000)]
JAL-2403 JAL-1483 push 'reverseRange' inside Matrix

7 years agoJAL-2388 Unit tests for columns, take 1
kiramt [Thu, 23 Feb 2017 18:14:13 +0000 (18:14 +0000)]
JAL-2388 Unit tests for columns, take 1

7 years agoJAL-2403 JAL-1483 changes to ScoreModelI hierarchy and signatures to
gmungoc [Thu, 23 Feb 2017 15:48:57 +0000 (15:48 +0000)]
JAL-2403 JAL-1483 changes to ScoreModelI hierarchy and signatures to
allow distance and similarity models to be used for Tree and PCA

7 years agoJAL-2403 additional methods to support distance/similarity score
gmungoc [Thu, 23 Feb 2017 15:39:01 +0000 (15:39 +0000)]
JAL-2403 additional methods to support distance/similarity score
conversion

7 years agoJAL-2388 Unit tests in progress
kiramt [Thu, 23 Feb 2017 10:18:02 +0000 (10:18 +0000)]
JAL-2388 Unit tests in progress

7 years agoJAL-2416 typo
gmungoc [Tue, 21 Feb 2017 17:02:51 +0000 (17:02 +0000)]
JAL-2416 typo

7 years agoJAL-2416 ScoreMatrix.getMatrix() returns a defensive copy to keep the
gmungoc [Tue, 21 Feb 2017 17:01:37 +0000 (17:01 +0000)]
JAL-2416 ScoreMatrix.getMatrix() returns a defensive copy to keep the
class invariant

7 years agoJAL-2416 support roundtrip print/parse of ScoreMatrix
gmungoc [Tue, 21 Feb 2017 13:36:59 +0000 (13:36 +0000)]
JAL-2416 support roundtrip print/parse of ScoreMatrix

7 years agoMerge branch 'develop' into features/JAL-2393customMatrices
gmungoc [Tue, 21 Feb 2017 11:56:39 +0000 (11:56 +0000)]
Merge branch 'develop' into features/JAL-2393customMatrices

Conflicts:
src/jalview/analysis/PCA.java
src/jalview/schemes/ResidueProperties.java
src/jalview/schemes/ScoreMatrix.java

7 years agoMerge branch 'bug/JAL-2421overviewboxflicker' into
kiramt [Tue, 21 Feb 2017 10:55:07 +0000 (10:55 +0000)]
Merge branch 'bug/JAL-2421overviewboxflicker' into
features/JAL-2388OverviewWindow

Conflicts:
src/jalview/gui/AlignmentPanel.java

7 years agoMerge branch 'develop' into features/JAL-2388OverviewWindow
kiramt [Tue, 21 Feb 2017 10:53:40 +0000 (10:53 +0000)]
Merge branch 'develop' into features/JAL-2388OverviewWindow

7 years agoJAL-2416 quality calculation now only depends on loaded score matrix
gmungoc [Tue, 21 Feb 2017 10:40:02 +0000 (10:40 +0000)]
JAL-2416 quality calculation now only depends on loaded score matrix

7 years agoJAL-2421 Unit test
kiramt [Tue, 21 Feb 2017 10:14:01 +0000 (10:14 +0000)]
JAL-2421 Unit test

7 years agoJAL-2416 more validation in ScoreMatrix constructor
gmungoc [Tue, 21 Feb 2017 10:13:06 +0000 (10:13 +0000)]
JAL-2416 more validation in ScoreMatrix constructor

7 years agoJAL-2403 ScoreModelI now DistanceModelI, ScoreMatrix delegate of
gmungoc [Mon, 20 Feb 2017 16:07:45 +0000 (16:07 +0000)]
JAL-2403 ScoreModelI now DistanceModelI, ScoreMatrix delegate of
PairwiseDistanceModel

7 years agoJAL-2416 replaced dependency on ResidueProperties with loaded score
gmungoc [Mon, 20 Feb 2017 16:04:08 +0000 (16:04 +0000)]
JAL-2416 replaced dependency on ResidueProperties with loaded score
matrix

7 years agoMerge branch 'features/JAL-2379pcaMemory' into develop
Jim Procter [Mon, 20 Feb 2017 11:36:39 +0000 (11:36 +0000)]
Merge branch 'features/JAL-2379pcaMemory' into develop

7 years agoJAL-2416 public constant for space gap character
gmungoc [Mon, 20 Feb 2017 10:36:41 +0000 (10:36 +0000)]
JAL-2416 public constant for space gap character

7 years agoJAL-2416 remove unused pep, dna alphabets, unused methods, code format
gmungoc [Mon, 20 Feb 2017 10:35:32 +0000 (10:35 +0000)]
JAL-2416 remove unused pep, dna alphabets, unused methods, code format
tidy

7 years agoJAL-2416 better encapsulated 'constants' for BLOSUM62, PAM250
gmungoc [Sat, 18 Feb 2017 08:21:41 +0000 (08:21 +0000)]
JAL-2416 better encapsulated 'constants' for BLOSUM62, PAM250

7 years agoJAL-2416 BLOSUM62 removed from ResidueProperties
gmungoc [Fri, 17 Feb 2017 19:26:26 +0000 (19:26 +0000)]
JAL-2416 BLOSUM62 removed from ResidueProperties

7 years agoJAL-2416 removed DNA and PAM250 matrices from ResidueProperties
gmungoc [Fri, 17 Feb 2017 17:44:56 +0000 (17:44 +0000)]
JAL-2416 removed DNA and PAM250 matrices from ResidueProperties

7 years agoJAL-2416 scoreMatrices removed from ResidueProperties
gmungoc [Fri, 17 Feb 2017 16:28:44 +0000 (16:28 +0000)]
JAL-2416 scoreMatrices removed from ResidueProperties

7 years agoJAL-2413 extracted new method SetUtils.countDisjunction()
gmungoc [Fri, 17 Feb 2017 15:41:39 +0000 (15:41 +0000)]
JAL-2413 extracted new method SetUtils.countDisjunction()

7 years agoJAL-2423 refactored method to build panel title for tree either
gmungoc [Fri, 17 Feb 2017 15:14:19 +0000 (15:14 +0000)]
JAL-2423 refactored method to build panel title for tree either
calculated or read from file

7 years agoJAL-2388 Incomplete unit tests
kiramt [Fri, 17 Feb 2017 14:57:39 +0000 (14:57 +0000)]
JAL-2388 Incomplete unit tests

7 years agoJAL-2416 SeqSpace PCA now provided as an alternative score matrix rather
gmungoc [Fri, 17 Feb 2017 13:31:49 +0000 (13:31 +0000)]
JAL-2416 SeqSpace PCA now provided as an alternative score matrix rather
than an alternative method (+code tidying)

7 years agoJAL-2416 score models now held in order added
gmungoc [Fri, 17 Feb 2017 13:30:39 +0000 (13:30 +0000)]
JAL-2416 score models now held in order added

7 years agoJAL-2416 allow space in score matrix name
gmungoc [Fri, 17 Feb 2017 13:30:01 +0000 (13:30 +0000)]
JAL-2416 allow space in score matrix name

7 years agoJAL-2416 order score models by order of addition rather than name
gmungoc [Fri, 17 Feb 2017 13:27:33 +0000 (13:27 +0000)]
JAL-2416 order score models by order of addition rather than name

7 years agoJAL-2403 redundant 'implements' removed
gmungoc [Fri, 17 Feb 2017 13:26:39 +0000 (13:26 +0000)]
JAL-2403 redundant 'implements' removed

7 years agoJAL-2403 extract method refactoring of FeatureScoreModel + test
gmungoc [Fri, 17 Feb 2017 13:25:42 +0000 (13:25 +0000)]
JAL-2403 extract method refactoring of FeatureScoreModel + test

7 years agoJAL-2421 incomplete unit test
kiramt [Fri, 17 Feb 2017 13:17:32 +0000 (13:17 +0000)]
JAL-2421 incomplete unit test

7 years agoJAL-2403 constants for "NJ", "AV"
gmungoc [Fri, 17 Feb 2017 10:31:11 +0000 (10:31 +0000)]
JAL-2403 constants for "NJ", "AV"

7 years agoJAL-2421 Fix to alignment panel scroll values, and start of unit test.
kiramt [Fri, 17 Feb 2017 07:46:07 +0000 (07:46 +0000)]
JAL-2421 Fix to alignment panel scroll values, and start of unit test.

7 years agoMerge branch 'bug/JAL-2374_JAL-2419_overlappinggroups_currentselection_popupmenu...
Jim Procter [Thu, 16 Feb 2017 11:49:57 +0000 (11:49 +0000)]
Merge branch 'bug/JAL-2374_JAL-2419_overlappinggroups_currentselection_popupmenu' into develop

7 years agoJAL-2374 JAL-2419 - TODO suspiciously redundant nested if clauses probably need a... bug/JAL-2374_JAL-2419_overlappinggroups_currentselection_popupmenu
Jim Procter [Wed, 15 Feb 2017 17:13:26 +0000 (17:13 +0000)]
JAL-2374 JAL-2419 - TODO suspiciously redundant nested if clauses probably need a cleanup

7 years agofix for JAL-2419 - don’t trash the current selection
Jim Procter [Wed, 15 Feb 2017 17:12:02 +0000 (17:12 +0000)]
fix for JAL-2419 - don’t trash the current selection

7 years agoJAL-2374 don’t search twice for containing group to assign to stretchGroup
Jim Procter [Wed, 15 Feb 2017 16:47:34 +0000 (16:47 +0000)]
JAL-2374 don’t search twice for containing group to assign to stretchGroup

7 years agoJAL-2374 tests for SequenceGroup.contains
Jim Procter [Wed, 15 Feb 2017 15:45:06 +0000 (15:45 +0000)]
JAL-2374 tests for SequenceGroup.contains

7 years agoJAL-2374 JAL-1270 assign SequenceGroup tests to ‘Functional’
Jim Procter [Wed, 15 Feb 2017 15:43:06 +0000 (15:43 +0000)]
JAL-2374 JAL-1270 assign SequenceGroup tests to ‘Functional’

7 years agoJAL-2374 new contains methods for seq and seq,apos
Jim Procter [Wed, 15 Feb 2017 15:41:58 +0000 (15:41 +0000)]
JAL-2374 new contains methods for seq and seq,apos

7 years agoJAL-2374 javadoc - qualify that sequence argument to findGroup must be in the Alignme...
Jim Procter [Wed, 15 Feb 2017 15:38:49 +0000 (15:38 +0000)]
JAL-2374 javadoc - qualify that sequence argument to findGroup must be in the Alignment, not share the same dataset sequence

7 years agoJAL-2393 example (unvalidated) blosum80 matrix to play with drag and
gmungoc [Tue, 14 Feb 2017 16:48:32 +0000 (16:48 +0000)]
JAL-2393 example (unvalidated) blosum80 matrix to play with drag and
drop

7 years agoParsing moved to (new) ScoreMatrixFile, drag and drop to alignment now
gmungoc [Tue, 14 Feb 2017 16:47:52 +0000 (16:47 +0000)]
Parsing moved to (new) ScoreMatrixFile, drag and drop to alignment now
supported

7 years agoJAL-2388 Removed unnecessary CommandListener interface from Viewports
kiramt [Tue, 14 Feb 2017 13:47:50 +0000 (13:47 +0000)]
JAL-2388 Removed unnecessary CommandListener interface from Viewports

7 years agoJAL-2416 allow alphabet symbol (optional) in first column of score table
gmungoc [Mon, 13 Feb 2017 17:00:37 +0000 (17:00 +0000)]
JAL-2416 allow alphabet symbol (optional) in first column of score table

7 years agoJAL-1632 JAL-2416 load score matrices from file, as float[][]
gmungoc [Mon, 13 Feb 2017 16:00:59 +0000 (16:00 +0000)]
JAL-1632 JAL-2416 load score matrices from file, as float[][]

7 years agoJAL-1632 first cut of Tree chooser dialog and ScoreModels singleton
gmungoc [Mon, 13 Feb 2017 09:01:54 +0000 (09:01 +0000)]
JAL-1632 first cut of Tree chooser dialog and ScoreModels singleton

7 years agoJAL-2371 small move of code, typo correction
gmungoc [Fri, 10 Feb 2017 11:03:15 +0000 (11:03 +0000)]
JAL-2371 small move of code, typo correction

7 years agoMerge remote-tracking branch 'origin/develop' into features/JAL-2388OverviewWindow
kiramt [Thu, 9 Feb 2017 15:30:02 +0000 (15:30 +0000)]
Merge remote-tracking branch 'origin/develop' into features/JAL-2388OverviewWindow

7 years agoJAL-2388 Initial refactor of OverviewPanel
kiramt [Thu, 9 Feb 2017 13:00:32 +0000 (13:00 +0000)]
JAL-2388 Initial refactor of OverviewPanel

7 years agoMerge branch 'features/JAL-2316' into develop
Jim Procter [Thu, 9 Feb 2017 12:49:33 +0000 (12:49 +0000)]
Merge branch 'features/JAL-2316' into develop

7 years agoMerge branch 'develop' into features/JAL-2316 features/JAL-2316
Jim Procter [Thu, 9 Feb 2017 11:50:07 +0000 (11:50 +0000)]
Merge branch 'develop' into features/JAL-2316

7 years agoJAL-2401 tweaked button text, added Spanish
gmungoc [Thu, 9 Feb 2017 11:40:09 +0000 (11:40 +0000)]
JAL-2401 tweaked button text, added Spanish

7 years agoJAL-2401 change 'Lower Case Colour' to checkbox with tooltip
gmungoc [Thu, 9 Feb 2017 10:39:22 +0000 (10:39 +0000)]
JAL-2401 change 'Lower Case Colour' to checkbox with tooltip

7 years agoJAL-2371 no test for lower case consensus as not expected or handled
gmungoc [Thu, 9 Feb 2017 10:05:21 +0000 (10:05 +0000)]
JAL-2371 no test for lower case consensus as not expected or handled

7 years agoJAL-2371 ensure some colour scheme (may be None) is set on startup
gmungoc [Thu, 9 Feb 2017 10:04:13 +0000 (10:04 +0000)]
JAL-2371 ensure some colour scheme (may be None) is set on startup

7 years agoMerge branch 'develop' into features/JAL-2379pcaMemory features/JAL-2379pcaMemory
gmungoc [Thu, 9 Feb 2017 09:05:30 +0000 (09:05 +0000)]
Merge branch 'develop' into features/JAL-2379pcaMemory

7 years agoJAL-2371 skip upper-casing consensus as it already is
gmungoc [Thu, 9 Feb 2017 09:01:13 +0000 (09:01 +0000)]
JAL-2371 skip upper-casing consensus as it already is

7 years agoJAL-2405 check for circular reference in SequenceGroup.context
gmungoc [Thu, 9 Feb 2017 08:49:38 +0000 (08:49 +0000)]
JAL-2405 check for circular reference in SequenceGroup.context

7 years agoJAL-2405 set initial selection group alignment context
gmungoc [Thu, 9 Feb 2017 08:41:33 +0000 (08:41 +0000)]
JAL-2405 set initial selection group alignment context

7 years agoJAL-2405 enable nucleotide/peptide colour schemes in applet menus
gmungoc [Thu, 9 Feb 2017 08:41:02 +0000 (08:41 +0000)]
JAL-2405 enable nucleotide/peptide colour schemes in applet menus

7 years agoJAL-2316 tidying preferences help page
Jim Procter [Wed, 8 Feb 2017 16:33:51 +0000 (16:33 +0000)]
JAL-2316 tidying preferences help page