X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FHiddenColumns.java;h=1ac6015c2706078f15300dd403cd79f3027eec38;hb=f57d1d3437767e14c2bf711af0e06c13b9d18cd4;hp=aa3446151d3095816197a1d06511ff5301350f93;hpb=04cb6a433a7ae367e57454c069222ccb830a03f1;p=jalview.git diff --git a/src/jalview/datamodel/HiddenColumns.java b/src/jalview/datamodel/HiddenColumns.java index aa34461..1ac6015 100644 --- a/src/jalview/datamodel/HiddenColumns.java +++ b/src/jalview/datamodel/HiddenColumns.java @@ -20,14 +20,10 @@ */ package jalview.datamodel; -import jalview.util.Comparison; - import java.util.ArrayList; import java.util.BitSet; import java.util.Iterator; import java.util.List; -import java.util.NoSuchElementException; -import java.util.Vector; import java.util.concurrent.locks.ReentrantReadWriteLock; public class HiddenColumns @@ -36,6 +32,8 @@ public class HiddenColumns private static final ReentrantReadWriteLock LOCK = new ReentrantReadWriteLock(); + private HiddenColumnsCursor cursor = new HiddenColumnsCursor(); + /* * list of hidden column [start, end] ranges; the list is maintained in * ascending start column order @@ -63,7 +61,13 @@ public class HiddenColumns { if (copy.hiddenColumns != null) { - hiddenColumns = copy.copyHiddenRegionsToArrayList(0); + hiddenColumns = new ArrayList<>(); + Iterator it = copy.iterator(); + while (it.hasNext()) + { + hiddenColumns.add(it.next()); + } + cursor.resetCursor(hiddenColumns); } } } finally @@ -108,6 +112,7 @@ public class HiddenColumns { region[0] - offset, region[1] - offset }); } } + cursor.resetCursor(hiddenColumns); } } finally { @@ -133,13 +138,17 @@ public class HiddenColumns StringBuilder regionBuilder = new StringBuilder(); if (hiddenColumns != null) { - for (int[] range : hiddenColumns) + Iterator it = hiddenColumns.iterator(); + while (it.hasNext()) { + int[] range = it.next(); regionBuilder.append(delimiter).append(range[0]).append(between) .append(range[1]); + if (!it.hasNext()) + { + regionBuilder.deleteCharAt(0); + } } - - regionBuilder.deleteCharAt(0); } return regionBuilder.toString(); } finally @@ -159,10 +168,12 @@ public class HiddenColumns { LOCK.readLock().lock(); int size = 0; - if (hasHiddenColumns()) + if (hiddenColumns != null) { - for (int[] range : hiddenColumns) + Iterator it = hiddenColumns.iterator(); + while (it.hasNext()) { + int[] range = it.next(); size += range[1] - range[0] + 1; } } @@ -220,10 +231,13 @@ public class HiddenColumns { return false; } - int i = 0; - for (int[] thisRange : hiddenColumns) + + Iterator it = hiddenColumns.iterator(); + Iterator thatit = that.iterator(); + while (it.hasNext()) { - int[] thatRange = that.hiddenColumns.get(i++); + int[] thisRange = it.next(); + int[] thatRange = thatit.next(); if (thisRange[0] != thatRange[0] || thisRange[1] != thatRange[1]) { return false; @@ -249,17 +263,23 @@ public class HiddenColumns { LOCK.readLock().lock(); int result = column; + if (hiddenColumns != null) { - for (int i = 0; i < hiddenColumns.size(); i++) + result += cursor.getHiddenOffset(column); + + /* + Iterator it = hiddenColumns.iterator(); + while (it.hasNext()) { - int[] region = hiddenColumns.get(i); + int[] region = it.next(); if (result >= region[0]) { result += region[1] - region[0] + 1; } - } + }*/ } + return result; } finally { @@ -282,29 +302,30 @@ public class HiddenColumns { LOCK.readLock().lock(); int result = hiddenColumn; + int[] region = null; if (hiddenColumns != null) { - int index = 0; - int[] region; - do + Iterator it = new RegionsIterator(0, + hiddenColumn, hiddenColumns, cursor); + while (it.hasNext()) { - region = hiddenColumns.get(index++); + region = it.next(); if (hiddenColumn > region[1]) { result -= region[1] + 1 - region[0]; } - } while ((hiddenColumn > region[1]) - && (index < hiddenColumns.size())); + } - if (hiddenColumn >= region[0] && hiddenColumn <= region[1]) + if (region != null && hiddenColumn >= region[0] + && hiddenColumn <= region[1]) { // Here the hidden column is within a region, so // we want to return the position of region[0]-1, adjusted for any // earlier hidden columns. // Calculate the difference between the actual hidden col position // and region[0]-1, and then subtract from result to convert result - // from - // the adjusted hiddenColumn value to the adjusted region[0]-1 value + // from the adjusted hiddenColumn value to the adjusted region[0]-1 + // value. // However, if the region begins at 0 we cannot return region[0]-1 // just return 0 @@ -341,64 +362,49 @@ public class HiddenColumns { try { - LOCK.readLock().lock(); int distance = visibleDistance; // in case startColumn is in a hidden region, move it to the left int start = adjustForHiddenColumns(findColumnPosition(startColumn)); - // get index of hidden region to left of start - int index = getHiddenIndexLeft(start); - if (index == -1) - { - // no hidden regions to left of startColumn - return start - distance; - } + Iterator it = new ReverseRegionsIterator(0, start, + hiddenColumns); - // walk backwards through the alignment subtracting the counts of visible - // columns from distance - int[] region; - int gap = 0; - int nextstart = start; - - while ((index > -1) && (distance - gap > 0)) + while (it.hasNext() && (distance > 0)) { - // subtract the gap to right of region from distance - distance -= gap; - start = nextstart; - - // calculate the next gap - region = hiddenColumns.get(index); - gap = start - region[1]; + int[] region = it.next(); - // set start to just to left of current region - nextstart = region[0] - 1; - index--; + if (start > region[1]) + { + // subtract the gap to right of region from distance + if (start - region[1] <= distance) + { + distance -= start - region[1]; + start = region[0] - 1; + } + else + { + start = start - distance; + distance = 0; + } + } } - if (distance - gap > 0) - { - // fell out of loop because there are no more hidden regions - distance -= gap; - return nextstart - distance; - } return start - distance; + } finally { LOCK.readLock().unlock(); } - } - - /** * This method returns the rightmost limit of a region of an alignment with * hidden columns. In otherwords, the next hidden column. * - * @param index - * int + * @param alPos + * the (visible) alignmentPosition to find the next hidden column for */ public int getHiddenBoundaryRight(int alPos) { @@ -407,33 +413,30 @@ public class HiddenColumns LOCK.readLock().lock(); if (hiddenColumns != null) { - int index = 0; - do + Iterator it = hiddenColumns.iterator(); + while (it.hasNext()) { - int[] region = hiddenColumns.get(index); + int[] region = it.next(); if (alPos < region[0]) { return region[0]; } - - index++; - } while (index < hiddenColumns.size()); + } } - return alPos; } finally { LOCK.readLock().unlock(); } - } /** * This method returns the leftmost limit of a region of an alignment with * hidden columns. In otherwords, the previous hidden column. * - * @param index - * int + * @param alPos + * the (visible) alignmentPosition to find the previous hidden column + * for */ public int getHiddenBoundaryLeft(int alPos) { @@ -441,19 +444,15 @@ public class HiddenColumns { LOCK.readLock().lock(); - if (hiddenColumns != null) + Iterator it = new ReverseRegionsIterator(0, alPos, + hiddenColumns); + while (it.hasNext()) { - int index = hiddenColumns.size() - 1; - do + int[] region = it.next(); + if (alPos > region[1]) { - int[] region = hiddenColumns.get(index); - if (alPos > region[1]) - { - return region[1]; - } - - index--; - } while (index > -1); + return region[1]; + } } return alPos; @@ -464,47 +463,12 @@ public class HiddenColumns } /** - * This method returns the index of the hidden region to the left of a column - * position. If the column is in a hidden region it returns the index of the - * region to the left. If there is no hidden region to the left it returns -1. - * - * @param pos - * int - */ - private int getHiddenIndexLeft(int pos) - { - try - { - - LOCK.readLock().lock(); - if (hiddenColumns != null) - { - int index = hiddenColumns.size() - 1; - do - { - int[] region = hiddenColumns.get(index); - if (pos > region[1]) - { - return index; - } - - index--; - } while (index > -1); - } - - return -1; - } finally - { - LOCK.readLock().unlock(); - } - - } - - /** - * Adds the specified column range to the hidden columns + * Adds the specified column range to the hidden columns collection * * @param start + * start of range to add (absolute position in alignment) * @param end + * end of range to add (absolute position in alignment) */ public void hideColumns(int start, int end) { @@ -528,66 +492,29 @@ public class HiddenColumns } /* - * traverse existing hidden ranges and insert / amend / append as - * appropriate + * new range follows everything else; check first to avoid looping over whole hiddenColumns collection */ - for (int i = 0; i < hiddenColumns.size(); i++) + if (hiddenColumns.isEmpty() + || start > hiddenColumns.get(hiddenColumns.size() - 1)[1]) { - int[] region = hiddenColumns.get(i); - - if (end < region[0] - 1) - { - /* - * insert discontiguous preceding range - */ - hiddenColumns.add(i, new int[] { start, end }); - return; - } - - if (end <= region[1]) - { - /* - * new range overlaps existing, or is contiguous preceding it - adjust - * start column - */ - region[0] = Math.min(region[0], start); - return; - } - - if (start <= region[1] + 1) + hiddenColumns.add(new int[] { start, end }); + } + else + { + /* + * traverse existing hidden ranges and insert / amend / append as + * appropriate + */ + boolean added = false; + for (int i = 0; !added && i < hiddenColumns.size(); i++) { - /* - * new range overlaps existing, or is contiguous following it - adjust - * start and end columns - */ - region[0] = Math.min(region[0], start); - region[1] = Math.max(region[1], end); - - /* - * also update or remove any subsequent ranges - * that are overlapped - */ - while (i < hiddenColumns.size() - 1) - { - int[] nextRegion = hiddenColumns.get(i + 1); - if (nextRegion[0] > end + 1) - { - /* - * gap to next hidden range - no more to update - */ - break; - } - region[1] = Math.max(nextRegion[1], end); - hiddenColumns.remove(i + 1); - } - return; - } + added = insertRangeAtRegion(i, start, end); + } // for + } + if (!wasAlreadyLocked) + { + cursor.resetCursor(hiddenColumns); } - - /* - * remaining case is that the new range follows everything else - */ - hiddenColumns.add(new int[] { start, end }); } finally { if (!wasAlreadyLocked) @@ -597,55 +524,113 @@ public class HiddenColumns } } - public boolean isVisible(int column) + /** + * Insert [start, range] at the region at index i in hiddenColumns, if + * feasible + * + * @param i + * index to insert at + * @param start + * start of range to insert + * @param end + * end of range to insert + * @return true if range was successfully inserted + */ + private boolean insertRangeAtRegion(int i, int start, int end) { - try + boolean added = false; + + int[] region = hiddenColumns.get(i); + if (end < region[0] - 1) { - LOCK.readLock().lock(); + /* + * insert discontiguous preceding range + */ + hiddenColumns.add(i, new int[] { start, end }); + added = true; + } + else if (end <= region[1]) + { + /* + * new range overlaps existing, or is contiguous preceding it - adjust + * start column + */ + region[0] = Math.min(region[0], start); + added = true; + } + else if (start <= region[1] + 1) + { + /* + * new range overlaps existing, or is contiguous following it - adjust + * start and end columns + */ + region[0] = Math.min(region[0], start); + region[1] = Math.max(region[1], end); - if (hiddenColumns != null) + /* + * also update or remove any subsequent ranges + * that are overlapped + */ + while (i < hiddenColumns.size() - 1) { - for (int[] region : hiddenColumns) + int[] nextRegion = hiddenColumns.get(i + 1); + if (nextRegion[0] > end + 1) { - if (column >= region[0] && column <= region[1]) - { - return false; - } + /* + * gap to next hidden range - no more to update + */ + break; } + region[1] = Math.max(nextRegion[1], end); + hiddenColumns.subList(i + 1, i + 2).clear(); } - - return true; - } finally - { - LOCK.readLock().unlock(); + added = true; } + return added; } - private ArrayList copyHiddenRegionsToArrayList(int startIndex) + /** + * Answers if a column in the alignment is visible + * + * @param column + * absolute position of column in the alignment + * @return true if column is visible + */ + public boolean isVisible(int column) { - int size = 0; - if (hiddenColumns != null) + try { - size = hiddenColumns.size(); - } - ArrayList copy = new ArrayList<>(size); + LOCK.readLock().lock(); - for (int i = startIndex, j = size; i < j; i++) - { - int[] rh; - int[] cp; - rh = hiddenColumns.get(i); - if (rh != null) + Iterator it = new RegionsIterator(column, column, + hiddenColumns, cursor); + while (it.hasNext()) { - cp = new int[rh.length]; - System.arraycopy(rh, 0, cp, 0, rh.length); - copy.add(cp); + int[] region = it.next(); + if (column >= region[0] && column <= region[1]) + { + return false; + } } - } - return copy; + return true; + } finally + { + LOCK.readLock().unlock(); + } } + /** + * Get the visible sections of a set of sequences + * + * @param start + * sequence position to start from + * @param end + * sequence position to end at + * @param seqs + * an array of sequences + * @return an array of strings encoding the visible parts of each sequence + */ public String[] getVisibleSequenceStrings(int start, int end, SequenceI[] seqs) { @@ -660,26 +645,22 @@ public class HiddenColumns { StringBuffer visibleSeq = new StringBuffer(); - int blockStart = start; - int blockEnd = end; - - Iterator regions = new BoundedHiddenColsIterator(start, - end, false); - while (regions.hasNext()) - { - int[] region = regions.next(); - blockStart = Math.min(blockStart, region[1] + 1); - blockEnd = Math.min(blockEnd, region[0]); - - visibleSeq.append(seqs[i].getSequence(blockStart, blockEnd)); - - blockStart = region[1] + 1; - blockEnd = end; - } + Iterator blocks = new VisibleContigsIterator(start, + end + 1, hiddenColumns); - if (end > blockStart) + while (blocks.hasNext()) { - visibleSeq.append(seqs[i].getSequence(blockStart, end)); + int[] block = blocks.next(); + if (blocks.hasNext()) + { + visibleSeq + .append(seqs[i].getSequence(block[0], block[1] + 1)); + } + else + { + visibleSeq + .append(seqs[i].getSequence(block[0], block[1])); + } } selections[i] = visibleSeq.toString(); @@ -701,88 +682,67 @@ public class HiddenColumns } /** - * Locate the first and last position visible for this sequence. if seq isn't - * visible then return the position of the left and right of the hidden - * boundary region, and the corresponding alignment column indices for the - * extent of the sequence + * Locate the first position visible for this sequence. If seq isn't visible + * then return the position of the left side of the hidden boundary region. * * @param seq - * @return int[] { visible start, visible end, first seqpos, last seqpos, - * alignment index for seq start, alignment index for seq end } + * sequence to find position for + * @return visible start position */ - public int[] locateVisibleBoundsOfSequence(SequenceI seq) + public int locateVisibleStartOfSequence(SequenceI seq) { try { LOCK.readLock().lock(); - int fpos = seq.getStart(); - int lpos = seq.getEnd(); int start = 0; if (hiddenColumns == null || hiddenColumns.size() == 0) { - int ifpos = seq.findIndex(fpos) - 1; - int ilpos = seq.findIndex(lpos) - 1; - return new int[] { ifpos, ifpos, ilpos }; + return seq.findIndex(seq.getStart()) - 1; } // Simply walk along the sequence whilst watching for hidden column // boundaries - Iterator regions = iterator(); - int spos = fpos; + Iterator regions = hiddenColumns.iterator(); int hideStart = seq.getLength(); int hideEnd = -1; int visPrev = 0; int visNext = 0; - int firstP = -1; - int lastP = -1; boolean foundStart = false; - for (int p = 0, pLen = seq.getLength(); spos <= seq.getEnd() - && p < pLen; p++) + + // step through the non-gapped positions of the sequence + for (int i = seq.getStart(); i <= seq.getEnd() && (!foundStart); i++) { - if (!Comparison.isGap(seq.getCharAt(p))) + // get alignment position of this residue in the sequence + int p = seq.findIndex(i) - 1; + + // update hidden region start/end + while (hideEnd < p && regions.hasNext()) { - // keep track of first/last column - // containing sequence data regardless of visibility - if (firstP == -1) - { - firstP = p; - } - lastP = p; - // update hidden region start/end - while (hideEnd < p && regions.hasNext()) - { - int[] region = regions.next(); - visPrev = visNext; - visNext += region[0] - visPrev; - hideStart = region[0]; - hideEnd = region[1]; - } - if (hideEnd < p) - { - hideStart = seq.getLength(); - } - // update visible boundary for sequence - if (p < hideStart) - { - if (!foundStart) - { - fpos = spos; - start = p; - foundStart = true; - } - lpos = spos; - } - // look for next sequence position - spos++; + int[] region = regions.next(); + visPrev = visNext; + visNext += region[0] - visPrev; + hideStart = region[0]; + hideEnd = region[1]; + } + if (hideEnd < p) + { + hideStart = seq.getLength(); + } + // update visible boundary for sequence + if (p < hideStart) + { + start = p; + foundStart = true; } } + if (foundStart) { - return new int[] { findColumnPosition(start), firstP, lastP }; + return findColumnPosition(start); } // otherwise, sequence was completely hidden - return new int[] { visPrev, firstP, lastP }; + return visPrev; } finally { LOCK.readLock().unlock(); @@ -843,50 +803,47 @@ public class HiddenColumns AlignmentAnnotation alignmentAnnotation) { // mangle the alignmentAnnotation annotation array - Vector annels = new Vector<>(); + ArrayList annels = new ArrayList<>(); Annotation[] els = null; - int blockStart = start; - int blockEnd = end; - int w = 0; - - Iterator regions = new BoundedHiddenColsIterator(start, end, - false); - while (regions.hasNext()) - { - int[] region = regions.next(); - blockStart = Math.min(blockStart, region[1] + 1); - blockEnd = Math.min(blockEnd, region[0]); - - els = new Annotation[blockEnd - blockStart]; - annels.addElement(els); - System.arraycopy(alignmentAnnotation.annotations, blockStart, els, 0, - els.length); - w += els.length; - - blockStart = region[1] + 1; - blockEnd = end; - } - if (end > blockStart) - { - els = new Annotation[end - blockStart + 1]; - annels.addElement(els); - if ((els.length - + blockStart) <= alignmentAnnotation.annotations.length) + int w = 0; + + Iterator blocks = new VisibleContigsIterator(start, end + 1, + hiddenColumns); + + int copylength; + int annotationLength; + while (blocks.hasNext()) + { + int[] block = blocks.next(); + annotationLength = block[1] - block[0] + 1; + + if (blocks.hasNext()) { // copy just the visible segment of the annotation row - System.arraycopy(alignmentAnnotation.annotations, blockStart, els, - 0, els.length); + copylength = annotationLength; } else { - // copy to the end of the annotation row - System.arraycopy(alignmentAnnotation.annotations, blockStart, els, - 0, (alignmentAnnotation.annotations.length - blockStart)); + if (annotationLength + block[0] <= alignmentAnnotation.annotations.length) + { + // copy just the visible segment of the annotation row + copylength = annotationLength; + } + else + { + // copy to the end of the annotation row + copylength = alignmentAnnotation.annotations.length - block[0]; + } } - w += els.length; + + els = new Annotation[annotationLength]; + annels.add(els); + System.arraycopy(alignmentAnnotation.annotations, block[0], els, 0, + copylength); + w += annotationLength; } - + if (w != 0) { alignmentAnnotation.annotations = new Annotation[w]; @@ -949,6 +906,7 @@ public class HiddenColumns { hideColumns(r[0], r[1]); } + cursor.resetCursor(hiddenColumns); } finally { LOCK.writeLock().unlock(); @@ -963,19 +921,17 @@ public class HiddenColumns try { LOCK.writeLock().lock(); - if (hiddenColumns != null) + Iterator it = hiddenColumns.iterator(); + while (it.hasNext()) { - for (int i = 0; i < hiddenColumns.size(); i++) + int[] region = it.next(); + for (int j = region[0]; j < region[1] + 1; j++) { - int[] region = hiddenColumns.get(i); - for (int j = region[0]; j < region[1] + 1; j++) - { - sel.addElement(j); - } + sel.addElement(j); } } - hiddenColumns = null; + cursor.resetCursor(hiddenColumns); } finally { LOCK.writeLock().unlock(); @@ -993,24 +949,31 @@ public class HiddenColumns try { LOCK.writeLock().lock(); - for (int i = 0; i < hiddenColumns.size(); i++) + Iterator it = new RegionsIterator(start, start, hiddenColumns, + cursor); + while (it.hasNext()) { - int[] region = hiddenColumns.get(i); + int[] region = it.next(); if (start == region[0]) { for (int j = region[0]; j < region[1] + 1; j++) { sel.addElement(j); } - - hiddenColumns.remove(region); + it.remove(); break; } + else if (start < region[0]) + { + break; // passed all possible matching regions + } } + if (hiddenColumns.size() == 0) { hiddenColumns = null; } + cursor.resetCursor(hiddenColumns); } finally { LOCK.writeLock().unlock(); @@ -1081,7 +1044,7 @@ public class HiddenColumns // of // preceding visible gaps // update hidden columns at the same time - Iterator regions = iterator(); + Iterator regions = hiddenColumns.iterator(); ArrayList newhidden = new ArrayList<>(); int numGapsBefore = 0; @@ -1115,6 +1078,7 @@ public class HiddenColumns } hiddenColumns = newhidden; + cursor.resetCursor(hiddenColumns); } finally { LOCK.writeLock().unlock(); @@ -1186,13 +1150,12 @@ public class HiddenColumns { LOCK.readLock().lock(); int hashCode = 1; - if (hiddenColumns != null) + Iterator it = hiddenColumns.iterator(); + while (it.hasNext()) { - for (int[] hidden : hiddenColumns) - { - hashCode = HASH_MULTIPLIER * hashCode + hidden[0]; - hashCode = HASH_MULTIPLIER * hashCode + hidden[1]; - } + int[] hidden = it.next(); + hashCode = HASH_MULTIPLIER * hashCode + hidden[0]; + hashCode = HASH_MULTIPLIER * hashCode + hidden[1]; } return hashCode; } finally @@ -1219,6 +1182,7 @@ public class HiddenColumns lastSet = inserts.nextClearBit(firstSet); hideColumns(firstSet, lastSet - 1); } + cursor.resetCursor(hiddenColumns); } finally { LOCK.writeLock().unlock(); @@ -1239,8 +1203,10 @@ public class HiddenColumns { return; } - for (int[] range : hiddenColumns) + Iterator it = hiddenColumns.iterator(); + while (it.hasNext()) { + int[] range = it.next(); inserts.set(range[0], range[1] + 1); } } finally @@ -1273,10 +1239,12 @@ public class HiddenColumns return new int[] { startPos, endPos }; } - for (int[] hiddenCol : hiddenColumns) + Iterator it = hiddenColumns.iterator(); + while (it.hasNext()) { - lowestRange = (hiddenCol[0] <= startPos) ? hiddenCol : lowestRange; - higestRange = (hiddenCol[1] >= endPos) ? hiddenCol : higestRange; + int[] range = it.next(); + lowestRange = (range[0] <= startPos) ? range : lowestRange; + higestRange = (range[1] >= endPos) ? range : higestRange; } if (lowestRange[0] == -1 && lowestRange[1] == -1) @@ -1301,7 +1269,6 @@ public class HiddenColumns { LOCK.readLock().unlock(); } - } /** @@ -1319,15 +1286,15 @@ public class HiddenColumns int adjres = adjustForHiddenColumns(res); int[] reveal = null; - if (hiddenColumns != null) + Iterator it = new RegionsIterator(adjres - 2, + adjres + 2, hiddenColumns, cursor); + while (it.hasNext()) { - for (int[] region : hiddenColumns) + int[] region = it.next(); + if (adjres + 1 == region[0] || adjres - 1 == region[1]) { - if (adjres + 1 == region[0] || adjres - 1 == region[1]) - { - reveal = region; - break; - } + reveal = region; + break; } } return reveal; @@ -1342,14 +1309,13 @@ public class HiddenColumns */ public Iterator iterator() { - if (hiddenColumns != null) + try { - int last = hiddenColumns.get(hiddenColumns.size() - 1)[1]; - return new BoundedHiddenColsIterator(0, last, true); - } - else + LOCK.readLock().lock(); + return new BoundedHiddenColsIterator(hiddenColumns); + } finally { - return new BoundedHiddenColsIterator(0, 0, true); + LOCK.readLock().unlock(); } } @@ -1364,7 +1330,14 @@ public class HiddenColumns */ public Iterator getBoundedIterator(int start, int end) { - return new BoundedHiddenColsIterator(start, end, true); + try + { + LOCK.readLock().lock(); + return new BoundedHiddenColsIterator(start, end, hiddenColumns); + } finally + { + LOCK.readLock().unlock(); + } } /** @@ -1378,12 +1351,19 @@ public class HiddenColumns */ public Iterator getBoundedStartIterator(int start, int end) { - return new BoundedStartRegionIterator(start, end, true); + try + { + LOCK.readLock().lock(); + return new BoundedStartRegionIterator(start, end, hiddenColumns); + } finally + { + LOCK.readLock().unlock(); + } } /** - * Return an iterator over visible columns between the given start and end - * boundaries + * Return an iterator over visible *columns* (not regions) between the given + * start and end boundaries * * @param start * first column (inclusive) @@ -1392,7 +1372,14 @@ public class HiddenColumns */ public Iterator getVisibleColsIterator(int start, int end) { - return new VisibleColsIterator(start, end, true); + try + { + LOCK.readLock().lock(); + return new VisibleColsIterator(start, end, hiddenColumns); + } finally + { + LOCK.readLock().unlock(); + } } /** @@ -1406,398 +1393,159 @@ public class HiddenColumns */ public Iterator getVisContigsIterator(int start, int end) { - return new VisibleContigsIterator(start, end, true); + try + { + LOCK.readLock().lock(); + return new VisibleContigsIterator(start, end, hiddenColumns); + } finally + { + LOCK.readLock().unlock(); + } } /** - * An iterator which iterates over hidden column regions in a range. + * return an iterator over visible segments between the given start and end + * boundaries + * + * @param start + * (first column - inclusive from 0) + * @param end + * (last column - inclusive) + * @param useVisibleCoords + * if true, start and end are visible column positions, not absolute + * positions */ - private class BoundedHiddenColsIterator implements Iterator + public Iterator getVisibleBlocksIterator(int start, int end, + boolean useVisibleCoords) { - private int start; // start position to iterate from - - private int end; // end position to iterate to - - // current index in hiddenColumns - private int currentPosition = 0; - - // current column in hiddenColumns - private int[] currentRegion; - - // whether to make a local copy of hiddenColumns - private final boolean useCopy; - - // local copy or reference to hiddenColumns - private List localHidden; - - /** - * Construct an iterator over hiddenColums bounded at - * [lowerBound,upperBound] - * - * @param lowerBound - * lower bound to iterate from - * @param upperBound - * upper bound to iterate to - * @param useCopyCols - * whether to make a local copy of hiddenColumns for iteration (set - * to true if calling from outwith the HiddenColumns class) - */ - BoundedHiddenColsIterator(int lowerBound, int upperBound, - boolean useCopyCols) + if (useVisibleCoords) + { + // TODO + // we should really just convert start and end here with + // adjustForHiddenColumns + // and then create a VisibleContigsIterator + // but without a cursor this will be horribly slow in some situations + // ... so until then... + return new VisibleBlocksVisBoundsIterator(start, end, true); + } + else { - start = lowerBound; - end = upperBound; - useCopy = useCopyCols; - try { - if (useCopy) - { - // assume that if useCopy is false the calling code has locked - // hiddenColumns - LOCK.readLock().lock(); - } - - if (hiddenColumns != null) - { - localHidden = new ArrayList<>(); - - // iterate until a region overlaps with [start,end] - int i = 0; - while ((i < hiddenColumns.size()) - && (hiddenColumns.get(i)[1] < start)) - { - i++; - } - - // iterate from start to end, adding each hidden region. Positions are - // absolute, and all regions which *overlap* [start,end] are added. - while (i < hiddenColumns.size() - && (hiddenColumns.get(i)[0] <= end)) - { - int[] rh; - int[] cp; - rh = hiddenColumns.get(i); - if (rh != null) - { - cp = new int[rh.length]; - System.arraycopy(rh, 0, cp, 0, rh.length); - localHidden.add(cp); - } - i++; - } - } - } - finally - { - if (useCopy) - { - LOCK.readLock().unlock(); - } - } - } - - @Override - public boolean hasNext() - { - return (localHidden != null) - && (currentPosition < localHidden.size()); - } - - @Override - public int[] next() + LOCK.readLock().lock(); + return new VisibleContigsIterator(start, end + 1, hiddenColumns); + } finally { - currentRegion = localHidden.get(currentPosition); - currentPosition++; - return currentRegion; + LOCK.readLock().unlock(); + } } } /** - * An iterator which iterates over visible start positions of hidden column - * regions in a range. + * An iterator which iterates over visible regions in a range. The range is + * specified in terms of visible column positions. Provides a special + * "endsAtHidden" indicator to allow callers to determine if the final visible + * column is adjacent to a hidden region. */ - private class BoundedStartRegionIterator implements Iterator + public class VisibleBlocksVisBoundsIterator implements Iterator { - // start position to iterate from - private int start; - - // end position to iterate to - private int end; + private List vcontigs = new ArrayList<>(); - // current index in hiddenColumns private int currentPosition = 0; - // local copy or reference to hiddenColumns - private List positions = null; + private boolean endsAtHidden = false; /** - * Construct an iterator over hiddenColums bounded at - * [lowerBound,upperBound] + * Constructor for iterator over visible regions in a range. * - * @param lowerBound - * lower bound to iterate from - * @param upperBound - * upper bound to iterate to - * @param useCopyCols - * whether to make a local copy of hiddenColumns for iteration (set - * to true if calling from outwith the HiddenColumns class) + * @param start + * start position in terms of visible column position + * @param end + * end position in terms of visible column position + * @param usecopy + * whether to use a local copy of hidden columns */ - BoundedStartRegionIterator(int lowerBound, int upperBound, - boolean useCopy) + VisibleBlocksVisBoundsIterator(int start, int end, boolean usecopy) { - start = lowerBound; - end = upperBound; - + /* actually this implementation always uses a local copy but this may change in future */ try { - if (useCopy) + if (usecopy) { - // assume that if useCopy is false the calling code has locked - // hiddenColumns LOCK.readLock().lock(); } - if (hiddenColumns != null) + if (hiddenColumns != null && hiddenColumns.size() > 0) { - positions = new ArrayList<>(hiddenColumns.size()); + int blockStart = start; + int blockEnd = end; + int hiddenSoFar = 0; + int visSoFar = 0; - // navigate to start, keeping count of hidden columns + // iterate until a region begins within (start,end] int i = 0; - int hiddenSoFar = 0; while ((i < hiddenColumns.size()) - && (hiddenColumns.get(i)[0] < start + hiddenSoFar)) + && (hiddenColumns.get(i)[0] <= blockStart + hiddenSoFar)) { - int[] region = hiddenColumns.get(i); - hiddenSoFar += region[1] - region[0] + 1; + hiddenSoFar += hiddenColumns.get(i)[1] - hiddenColumns.get(i)[0] + + 1; i++; } - // iterate from start to end, adding start positions of each - // hidden region. Positions are visible columns count, not absolute + blockStart += hiddenSoFar; // convert start to absolute position + blockEnd += hiddenSoFar; // convert end to absolute position + + // iterate from start to end, adding each visible region. Positions + // are + // absolute, and all hidden regions which overlap [start,end] are + // used. while (i < hiddenColumns.size() - && (hiddenColumns.get(i)[0] <= end + hiddenSoFar)) + && (hiddenColumns.get(i)[0] <= blockEnd)) { int[] region = hiddenColumns.get(i); - positions.add(region[0] - hiddenSoFar); - hiddenSoFar += region[1] - region[0] + 1; - i++; - } - } - else - { - positions = new ArrayList<>(); - } - } finally - { - if (useCopy) - { - LOCK.readLock().unlock(); - } - } - } - - @Override - public boolean hasNext() - { - return (currentPosition < positions.size()); - } - - /** - * Get next hidden region start position - * - * @return the start position in *visible* coordinates - */ - @Override - public Integer next() - { - int result = positions.get(currentPosition); - currentPosition++; - return result; - } - } - - private class VisibleColsIterator implements Iterator - { - private int last; - - private int current; - private int next; + // end position of this visible region is either just before the + // start of the next hidden region, or the absolute position of + // 'end', whichever is lowest + blockEnd = Math.min(blockEnd, region[0] - 1); - private List localHidden = new ArrayList<>(); + vcontigs.add(new int[] { blockStart, blockEnd }); - private int lasthiddenregion; - - VisibleColsIterator(int firstcol, int lastcol, boolean useCopy) - { - last = lastcol; - current = firstcol; - next = firstcol; - lasthiddenregion = -1; + visSoFar += blockEnd - blockStart + 1; - try - { - if (useCopy) - { - // assume that if useCopy is false the calling code has locked - // hiddenColumns - LOCK.readLock().lock(); - } + // next visible region starts after this hidden region + blockStart = region[1] + 1; - if (hiddenColumns != null) - { - int i = 0; - for (i = 0; i < hiddenColumns.size() - && (current < hiddenColumns.get(i)[0]); ++i) - { - if (current >= hiddenColumns.get(i)[0] - && current <= hiddenColumns.get(i)[1]) - { - // current is hidden, move to right - current = hiddenColumns.get(i)[1] + 1; - next = current; - } - } + hiddenSoFar += region[1] - region[0] + 1; - lasthiddenregion = i - 1; + // reset blockEnd to absolute position of 'end', assuming we've now + // passed all hidden regions before end + blockEnd = end + hiddenSoFar; - for (i = hiddenColumns.size() - 1; i >= 0 - && (last > hiddenColumns.get(i)[1]); --i) - { - if (last >= hiddenColumns.get(i)[0] - && last <= hiddenColumns.get(i)[1]) - { - // last is hidden, move to left - last = hiddenColumns.get(i)[0] - 1; - } - } - - // make a local copy of the bit we need - i = lasthiddenregion + 1; - while (i < hiddenColumns.size() - && hiddenColumns.get(i)[0] <= last) - { - int[] region = new int[] { hiddenColumns.get(i)[0], - hiddenColumns.get(i)[1] }; - localHidden.add(region); i++; } - lasthiddenregion = -1; - } - } finally - { - if (useCopy) - { - LOCK.readLock().unlock(); - } - } - } - - @Override - public boolean hasNext() - { - return next <= last; - } - - @Override - public Integer next() - { - if (next > last) - { - throw new NoSuchElementException(); - } - current = next; - if ((localHidden != null) - && (lasthiddenregion + 1 < localHidden.size())) - { - // still some more hidden regions - if (next + 1 < localHidden.get(lasthiddenregion + 1)[0]) - { - // next+1 is still before the next hidden region - next++; - } - else if ((next + 1 >= localHidden.get(lasthiddenregion + 1)[0]) - && (next + 1 <= localHidden.get(lasthiddenregion + 1)[1])) - { - // next + 1 is in the next hidden region - next = localHidden.get(lasthiddenregion + 1)[1] + 1; - lasthiddenregion++; - } - } - else - { - // finished with hidden regions, just increment normally - next++; - } - return current; - } - - @Override - public void remove() - { - throw new UnsupportedOperationException(); - } - } - - /** - * An iterator which iterates over visible regions in a range. - */ - private class VisibleContigsIterator implements Iterator - { - private List vcontigs = new ArrayList<>(); - - private int currentPosition = 0; - - VisibleContigsIterator(int start, int end, boolean usecopy) - { - try - { - if (usecopy) - { - LOCK.readLock().lock(); - } - - if (hiddenColumns != null && hiddenColumns.size() > 0) - { - int vstart = start; - int hideStart; - int hideEnd; - - for (int[] region : hiddenColumns) + if (visSoFar < end - start) { - hideStart = region[0]; - hideEnd = region[1]; - - // navigate to start - if (hideEnd < vstart) - { - continue; - } - if (hideStart > vstart) - { - int[] contig = new int[] { vstart, hideStart - 1 }; - vcontigs.add(contig); - } - vstart = hideEnd + 1; - - // exit if we're past the end - if (vstart >= end) + // the number of visible columns we've accounted for is less than + // the number specified by end-start; work out the end position of + // the last visible region + blockEnd = blockStart + end - start - visSoFar; + vcontigs.add(new int[] { blockStart, blockEnd }); + + // if the last visible region ends at the next hidden region, set + // endsAtHidden=true + if (i < hiddenColumns.size() + && hiddenColumns.get(i)[0] - 1 == blockEnd) { - break; + endsAtHidden = true; } } - - if (vstart < end) - { - int[] contig = new int[] { vstart, end - 1 }; - vcontigs.add(contig); - } } else { - int[] contig = new int[] { start, end - 1 }; - vcontigs.add(contig); + // there are no hidden columns, return a single visible contig + vcontigs.add(new int[] { start, end }); + endsAtHidden = false; } } finally { @@ -1821,5 +1569,10 @@ public class HiddenColumns currentPosition++; return result; } + + public boolean endsAtHidden() + { + return endsAtHidden; + } } }