Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DistaClusters #71

Open
wants to merge 42 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
f905e49
Started work on distance clusters.
gaurav Nov 13, 2010
e3095ff
Some more work done.
gaurav Nov 13, 2010
8a61f24
Merge branch 'master' into clusters
gaurav Nov 13, 2010
896ed2a
Undid my attempts at using 'lib/'s. Going to avoid that for now.
gaurav Dec 4, 2010
50f17dd
Added support for a simple command line interface.
gaurav Dec 4, 2010
713ccda
Renamed simple to cli.
gaurav Dec 4, 2010
f0b7616
Added support for loading file.
gaurav Dec 4, 2010
f0f18ed
We can now load files quite easily.
gaurav Dec 4, 2010
32b8941
Fixed up some more DClusters stuff.
gaurav Mar 30, 2011
93380e0
Add a new file to represent a linkage.
gaurav Mar 30, 2011
09b7c38
Merge branch 'develop' into clusters, thus updating that whole move-a…
gaurav Apr 12, 2011
7694311
Lots of exciting changes, but everything's coming together really well!
gaurav Apr 12, 2011
300f1b0
Fixed Kathy's bug - again.
gaurav Apr 13, 2011
2d62a82
Prettied up the output, and brought SpeciesDetails into this.
gaurav Apr 13, 2011
6488237
Renamed project from 'DClusters' to 'DtClusters' to sightly improve o…
gaurav Apr 14, 2011
6384080
More pottering about with stuff.
gaurav Apr 15, 2011
06add0a
Started work on a new class which represented a collection of cluster…
gaurav Apr 18, 2011
a90e428
Some rather complicated rewiring-with-interfaces so things "just work".
gaurav Apr 18, 2011
d258918
Last few bits in. ClusterNode works! But also needs testing.
gaurav Apr 18, 2011
4ef6b15
Displaying the initial frame as buttons in a Panel.
gaurav Apr 20, 2011
20aa55f
Working on getting the rendering of our objects to work correctly.
gaurav May 9, 2011
52965c7
Poking about a bit, but lost in the maths. Will try a simpler approach!
gaurav May 14, 2011
18cf294
Huh. Not bad for a long night's hacking.
gaurav May 14, 2011
e4c0033
Woohoo distaclusters!
gaurav May 15, 2011
add1aee
Cleaned up ClusterNode.java slightly.
gaurav Jun 8, 2011
0346209
Added up a new frame, with a snappy new user interface to play with.
gaurav Jun 25, 2011
60ce00b
Lots of new features and suchlike.
gaurav Jun 25, 2011
91e6723
Created a proper deployment/release system for DtClusters.
gaurav Jun 27, 2011
4c39527
Polished up and ready for a small demo!
gaurav Jun 27, 2011
4e8f820
New release.
gaurav Jun 27, 2011
502acc9
Fixed the table so that it can't be edited (in two different ways!)
gaurav Jun 29, 2011
fad49c5
Created a SequencesViewer, which is currently only capable of exporti…
gaurav Jul 1, 2011
d8499ba
Created a basic SequenceListVisualization which can display informati…
gaurav Jul 1, 2011
5850748
Tried (very unsuccessfully) to reintegrate the earlier "line view" in…
gaurav Jul 2, 2011
02b4432
Incremented version number.
gaurav Jul 4, 2011
0e02b32
Midnight commit: some data massaging before getting the visualization…
gaurav Jul 4, 2011
29d1f1e
Midnight commit. This RulerLayout is working, sort of, but there's a …
gaurav Jul 8, 2011
c734249
Midnight commit.
gaurav Jul 16, 2011
82ca851
Most sophisticated layout-components system we're going to try. After…
gaurav Jul 27, 2011
dc68ce1
Removed RulerLayout, new plan of action.
gaurav May 21, 2012
1723037
Noted down my plan so that I would remember it.
gaurav May 21, 2012
7f624ac
Saved newly compiled jar files and new DtClusters.bat.
gaurav Jul 5, 2012
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 34 additions & 0 deletions Release/DistanceClusters/MacOSX/Changes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
Changelog
==========

- Development

- 1.7.9
- Turned off displaying 'N's in the display, as we don't re-export
those anyway.
- Fixed a bug in the Cluster tool reported by Michael Balke: single
species without conspecific sequences in the dataset were being
reported as 'Split'.

- 1.7.8
- Added DOI to the citation for Sequence Matrix.

- 1.7.7-dev4
- Naked Nexus now replaces all non-alphanumeric characters with underscores.

- 1.7.7-dev3
- Fixed a minor bug with clustering in which the "% of valid comparisons
above the threshold" number was always 0%.
- Fixed a bug in which multiple "Cluster" analyses in the same session
caused the ProgressDialog to never close, resulting in the program
getting "stuck" and a forced quit becoming necessary.

- 1.7.7-dev2
- Rewrote SpeciesDetails to remove the old, bug-ridden algorithm.
The new one will probably actually work.
- Added discrimination between "Split only", "Lumped/Split" and
"Lumped" for clusters in Cluster.

- 1.7.6 (June 6, 2010)
- Added code to detect overlapping codonsets on input (#19).
- Fixed a bug relating to TNT files exported into directory (#55).
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleAllowMixedLocalizations</key>
<string>true</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>JavaApplicationStub</string>
<key>CFBundleIconFile</key>
<string>GenericJavaApp.icns</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>DistanceClusters</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>100.0</string>
<key>Java</key>
<dict>
<key>ClassPath</key>
<string>$JAVAROOT/DtClusters.jar</string>
<key>JVMVersion</key>
<string>1.4+</string>
<key>MainClass</key>
<string>com.ggvaidya.TaxonDNA.DtClusters.DtClusters</string>
<key>VMOptions</key>
<string>-Xmx1000m</string>
</dict>
</dict>
</plist>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
APPL????
Binary file not shown.
Binary file not shown.
Binary file not shown.
34 changes: 34 additions & 0 deletions Release/DistanceClusters/Windows/Changes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
Changelog
==========

- Development

- 1.7.9
- Turned off displaying 'N's in the display, as we don't re-export
those anyway.
- Fixed a bug in the Cluster tool reported by Michael Balke: single
species without conspecific sequences in the dataset were being
reported as 'Split'.

- 1.7.8
- Added DOI to the citation for Sequence Matrix.

- 1.7.7-dev4
- Naked Nexus now replaces all non-alphanumeric characters with underscores.

- 1.7.7-dev3
- Fixed a minor bug with clustering in which the "% of valid comparisons
above the threshold" number was always 0%.
- Fixed a bug in which multiple "Cluster" analyses in the same session
caused the ProgressDialog to never close, resulting in the program
getting "stuck" and a forced quit becoming necessary.

- 1.7.7-dev2
- Rewrote SpeciesDetails to remove the old, bug-ridden algorithm.
The new one will probably actually work.
- Added discrimination between "Split only", "Lumped/Split" and
"Lumped" for clusters in Cluster.

- 1.7.6 (June 6, 2010)
- Added code to detect overlapping codonsets on input (#19).
- Fixed a bug relating to TNT files exported into directory (#55).
2 changes: 2 additions & 0 deletions Release/DistanceClusters/Windows/DtClusters.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
%WINDIR%\System32\java.exe -Xmx1000M -jar DtClusters.jar
Binary file added Release/DistanceClusters/Windows/DtClusters.jar
Binary file not shown.
Binary file not shown.
Binary file modified Release/SequenceMatrix/SequenceMatrix.jar
Binary file not shown.
Binary file modified Release/SequenceMatrix/Windows/SequenceMatrix.jar
Binary file not shown.
Binary file modified Release/SpeciesIdentifier/SpeciesIdentifier.jar
Binary file not shown.
7 changes: 7 additions & 0 deletions Tests/expected/output.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Cluster stability between 1.0% and 5.0% on Fri Apr 15 16:40:38 SGT 2011 upon 1390 sequences
Threshold Clusters Shared clusters
1.0 582 NA
2.0 503 -1
3.0 471 -1
4.0 438 -1
5.0 403 -1
31,970 changes: 31,970 additions & 0 deletions Tests/files/Diptera COI - all.fasta

Large diffs are not rendered by default.

36,807 changes: 4,837 additions & 31,970 deletions Tests/files/Diptera COI.fasta

Large diffs are not rendered by default.

4,837 changes: 4,837 additions & 0 deletions Tests/files/DipteraCOI-806seq-300bp-overlap-from-371-to-670.fasta

Large diffs are not rendered by default.