From 42c3d7443230f411ab1ab463205b58cd8c9f8b67 Mon Sep 17 00:00:00 2001 From: asivache Date: Fri, 15 Oct 2010 16:27:40 +0000 Subject: [PATCH] bug fix git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4503 348d0f76-0448-11de-a6fe-93d51630548a --- .../utils/interval/OverlappingIntervalIterator.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/java/src/org/broadinstitute/sting/utils/interval/OverlappingIntervalIterator.java b/java/src/org/broadinstitute/sting/utils/interval/OverlappingIntervalIterator.java index 5202b8518..0b63d582e 100755 --- a/java/src/org/broadinstitute/sting/utils/interval/OverlappingIntervalIterator.java +++ b/java/src/org/broadinstitute/sting/utils/interval/OverlappingIntervalIterator.java @@ -64,8 +64,8 @@ public class OverlappingIntervalIterator implements Iterator { this.boundBy = new PushbackIterator(boundBy); if ( iter.hasNext() && boundBy.hasNext() ) { - GenomeLoc currentInterval = iter.next(); // load first interval - GenomeLoc currentBound = boundBy.next(); // load first bounding interval + currentInterval = iter.next(); // load first interval + currentBound = boundBy.next(); // load first bounding interval fetchNextOverlap(); } } @@ -76,16 +76,18 @@ public class OverlappingIntervalIterator implements Iterator { private void fetchNextOverlap() { prefetchedOverlap = null; - + // System.out.println("Fetching... (interval="+currentInterval+"; bound="+currentBound+")"); while ( currentInterval != null && currentBound != null ) { if ( currentInterval.isBefore(currentBound) ) { +// System.out.println(currentInterval +" is before "+currentBound ); if ( ! iter.hasNext() ) currentInterval = null; else currentInterval = iter.next(); continue; } if ( currentInterval.isPast(currentBound) ) { +// System.out.println(currentInterval +" is past "+currentBound ); if ( ! boundBy.hasNext() ) currentBound = null; else currentBound = boundBy.next(); continue; @@ -94,7 +96,7 @@ public class OverlappingIntervalIterator implements Iterator { // we are at this point only if currentInterval overlaps with currentBound prefetchedOverlap = currentInterval.intersect(currentBound); - +// System.out.println("Fetched next overlap: "+prefetchedOverlap); // now we need to advance at least one of the iterators, so that we would not // call the same overlap again