diff --git a/build.xml b/build.xml index 2cd8dec03..c468d88fd 100644 --- a/build.xml +++ b/build.xml @@ -4,6 +4,7 @@ + @@ -33,13 +34,19 @@ - - - - - - - + + + + + + + + + + + + + @@ -195,12 +202,28 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -239,11 +262,13 @@ + - + additionalparam="-build-timestamp "${build.timestamp}" -version-suffix .${build.version} -out ${basedir}/${resource.path} -quiet"> + + @@ -611,7 +636,7 @@ - + @@ -619,7 +644,7 @@ - + @@ -639,9 +664,7 @@ - - - + @@ -651,6 +674,5 @@ - diff --git a/java/src/org/broadinstitute/sting/gatk/examples/HelloWalker.java b/java/src/org/broadinstitute/sting/gatk/examples/HelloWalker.java deleted file mode 100644 index cad8638e6..000000000 --- a/java/src/org/broadinstitute/sting/gatk/examples/HelloWalker.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2009 The Broad Institute - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ -import org.broadinstitute.sting.gatk.walkers.LocusWalker; -import org.broadinstitute.sting.gatk.contexts.AlignmentContext; -import org.broadinstitute.sting.gatk.contexts.ReferenceContext; -import org.broadinstitute.sting.gatk.refdata.RefMetaDataTracker; -import org.broadinstitute.sting.commandline.Output; - -import java.io.PrintStream; - -/** - * An example walker for illustrative purposes. - */ -public class HelloWalker extends LocusWalker { - @Output - PrintStream out; - - /** - * The map function runs once per single-base locus, and accepts a 'context', a - * data structure consisting of the reads which overlap the locus, the sites over - * which they fall, and the base from the reference that overlaps. - * @param tracker The accessor for reference metadata. - * @param ref The reference base that lines up with this locus. - * @param context Information about reads aligning to this locus. - * @return In this case, returns a count of how many loci were seen at this site (1). - */ - @Override - public Integer map(RefMetaDataTracker tracker, ReferenceContext ref, AlignmentContext context) { - out.printf("Hello locus %s; your ref base is %c and you have %d reads%n", context.getLocation(), ref.getBase(), context.getBasePileup().size() ); - return 1; - } - - /** - * Provides an initial value for the reduce function. Hello walker counts loci, - * so the base case for the inductive step is 0, indicating that the walker has seen 0 loci. - * @return 0. - */ - @Override - public Long reduceInit() { return 0L; } - - /** - * Combines the result of the latest map with the accumulator. In inductive terms, - * this represents the step loci[x + 1] = loci[x] + 1 - * @param value result of the map. - * @param sum accumulator for the reduce. - * @return The total count of loci processed so far. - */ - @Override - public Long reduce(Integer value, Long sum) { - return sum + value; - } - - /** - * Retrieves the final result of the traversal. - * @param result The ultimate value of the traversal, produced when map[n] is combined with reduce[n-1] - * by the reduce function. - */ - @Override - public void onTraversalDone(Long result) { - out.println("Number of loci viewed is: " + result); - } -} diff --git a/java/src/org/broadinstitute/sting/gatk/examples/build.xml b/java/src/org/broadinstitute/sting/gatk/examples/build.xml deleted file mode 100644 index 8acab9eac..000000000 --- a/java/src/org/broadinstitute/sting/gatk/examples/build.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - Build the GATK examples - - - - - - - - - - - - - -