diff --git a/java/src/org/broadinstitute/sting/utils/DoublyLinkedList.java b/java/src/org/broadinstitute/sting/gatk/walkers/phasing/DoublyLinkedList.java similarity index 98% rename from java/src/org/broadinstitute/sting/utils/DoublyLinkedList.java rename to java/src/org/broadinstitute/sting/gatk/walkers/phasing/DoublyLinkedList.java index b4b2d1bd9..d90544460 100644 --- a/java/src/org/broadinstitute/sting/utils/DoublyLinkedList.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/phasing/DoublyLinkedList.java @@ -1,7 +1,3 @@ -package org.broadinstitute.sting.utils; - -import java.util.NoSuchElementException; - /* * Copyright (c) 2010, The Broad Institute * @@ -25,6 +21,9 @@ import java.util.NoSuchElementException; * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ +package org.broadinstitute.sting.gatk.walkers.phasing; + +import java.util.NoSuchElementException; public class DoublyLinkedList { private DoublyLinkedNode first; diff --git a/java/src/org/broadinstitute/sting/utils/Graph.java b/java/src/org/broadinstitute/sting/gatk/walkers/phasing/Graph.java similarity index 98% rename from java/src/org/broadinstitute/sting/utils/Graph.java rename to java/src/org/broadinstitute/sting/gatk/walkers/phasing/Graph.java index 2d497b40f..c15993416 100644 --- a/java/src/org/broadinstitute/sting/utils/Graph.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/phasing/Graph.java @@ -1,10 +1,3 @@ -package org.broadinstitute.sting.utils; - -import org.broadinstitute.sting.utils.DisjointSet; -import org.broadinstitute.sting.utils.GraphEdge; - -import java.util.*; - /* * Copyright (c) 2010, The Broad Institute * @@ -28,6 +21,11 @@ import java.util.*; * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ +package org.broadinstitute.sting.gatk.walkers.phasing; + +import org.broadinstitute.sting.utils.DisjointSet; + +import java.util.*; // Represents an undirected graph with no self-edges: public class Graph implements Iterable { diff --git a/java/src/org/broadinstitute/sting/utils/GraphEdge.java b/java/src/org/broadinstitute/sting/gatk/walkers/phasing/GraphEdge.java similarity index 97% rename from java/src/org/broadinstitute/sting/utils/GraphEdge.java rename to java/src/org/broadinstitute/sting/gatk/walkers/phasing/GraphEdge.java index 94fe17776..568195236 100644 --- a/java/src/org/broadinstitute/sting/utils/GraphEdge.java +++ b/java/src/org/broadinstitute/sting/gatk/walkers/phasing/GraphEdge.java @@ -1,5 +1,3 @@ -package org.broadinstitute.sting.utils; - /* * Copyright (c) 2010, The Broad Institute * @@ -23,6 +21,7 @@ package org.broadinstitute.sting.utils; * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ +package org.broadinstitute.sting.gatk.walkers.phasing; public class GraphEdge implements Comparable { protected int v1; diff --git a/java/src/org/broadinstitute/sting/utils/CardinalityCounter.java b/java/src/org/broadinstitute/sting/utils/CardinalityCounter.java index 50d5e8dda..90181e37d 100644 --- a/java/src/org/broadinstitute/sting/utils/CardinalityCounter.java +++ b/java/src/org/broadinstitute/sting/utils/CardinalityCounter.java @@ -1,17 +1,32 @@ +/* + * Copyright (c) 2010, 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. + */ package org.broadinstitute.sting.utils; import org.broadinstitute.sting.utils.exceptions.ReviewedStingException; import java.util.Iterator; -/** - * Created by IntelliJ IDEA. - * User: fromer - * Date: Aug 19, 2010 - * Time: 9:33:54 AM - * To change this template use File | Settings | File Templates. - */ - /* * CardinalityCounter object allows user to iterate over all assignment of arbitrary-cardinality variables. */ diff --git a/java/src/org/broadinstitute/sting/utils/DisjointSet.java b/java/src/org/broadinstitute/sting/utils/DisjointSet.java index 9a8b96aac..5f68d3414 100644 --- a/java/src/org/broadinstitute/sting/utils/DisjointSet.java +++ b/java/src/org/broadinstitute/sting/utils/DisjointSet.java @@ -1,7 +1,3 @@ -package org.broadinstitute.sting.utils; - -import java.util.*; - /* * Copyright (c) 2010, The Broad Institute * @@ -25,6 +21,9 @@ import java.util.*; * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ +package org.broadinstitute.sting.utils; + +import java.util.*; public class DisjointSet { private ItemNode[] nodes; diff --git a/java/src/org/broadinstitute/sting/utils/PreciseNonNegativeDouble.java b/java/src/org/broadinstitute/sting/utils/PreciseNonNegativeDouble.java index 488d4b30f..d8921e1d3 100644 --- a/java/src/org/broadinstitute/sting/utils/PreciseNonNegativeDouble.java +++ b/java/src/org/broadinstitute/sting/utils/PreciseNonNegativeDouble.java @@ -1,12 +1,27 @@ -package org.broadinstitute.sting.utils; - -/** - * Created by IntelliJ IDEA. - * User: fromer - * Date: Aug 18, 2010 - * Time: 4:55:23 PM - * To change this template use File | Settings | File Templates. +/* + * Copyright (c) 2010, 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. */ +package org.broadinstitute.sting.utils; /* PreciseNonNegativeDouble permits arithmetic operations on NON-NEGATIVE double values with precision (prevents underflow by representing in log10 space).