X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.history%2Fsrc%2Forg%2Fsimantics%2Fhistory%2Futil%2FStreamIterator.java;h=e548f9bf805efd0ff3a3edce39fb20ef73325a1e;hb=refs%2Fchanges%2F38%2F238%2F2;hp=c30862af53c185dc2a1cbb52150f0b9e5704fcb4;hpb=24e2b34260f219f0d1644ca7a138894980e25b14;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.history/src/org/simantics/history/util/StreamIterator.java b/bundles/org.simantics.history/src/org/simantics/history/util/StreamIterator.java
index c30862af5..e548f9bf8 100644
--- a/bundles/org.simantics.history/src/org/simantics/history/util/StreamIterator.java
+++ b/bundles/org.simantics.history/src/org/simantics/history/util/StreamIterator.java
@@ -1,291 +1,291 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2012 Association for Decentralized Information Management in
- * Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.history.util;
-
-import org.simantics.databoard.Bindings;
-import org.simantics.databoard.accessor.ArrayAccessor;
-import org.simantics.databoard.accessor.error.AccessorException;
-import org.simantics.databoard.binding.Binding;
-import org.simantics.databoard.binding.RecordBinding;
-import org.simantics.databoard.binding.error.BindingException;
-import org.simantics.history.HistoryException;
-
-/**
- * Stream iterator iterates sample entries in an array.
- * 
- * Is scans the next sample and knows its time stamp.
- * 
- * @author toni.kalajainen
- */
-public class StreamIterator {
-
-	// Sample binding
-	RecordBinding sampleBinding;
-	
-	// Array accessor
-	ArrayAccessor aa;
-	// Array stream
-	Stream stream;
-	// From and end times of the whole stream
-	double from, end;
-	
-	// Current and next sample
-	Object current, next;
-
-	// Utility for reading sample
-	ValueBand valueBand, nextValueBand;
-	// Start and end time of current sample
-	double startTime, endTime;
-	
-	int index = -1;
-	int size;
-	
-	public StreamIterator(ArrayAccessor aa) throws HistoryException {
-		try {
-			this.aa = aa;
-			sampleBinding = (RecordBinding) Bindings.getBeanBinding( aa.type().componentType );
-			current = sampleBinding.createDefault();
-			next = sampleBinding.createDefault();
-			valueBand = new ValueBand(sampleBinding, current);
-			nextValueBand = new ValueBand(sampleBinding, next);
-			stream = new Stream( aa, sampleBinding );
-			size = aa.size();
-			if ( size>0 ) {
-		    	aa.get(0, sampleBinding, current);
-				from = valueBand.getTimeDouble();
-		    	aa.get(size-1, sampleBinding, current);
-				end = valueBand.hasEndTime() ? valueBand.getEndTimeDouble() : valueBand.getTimeDouble();
-			}
-		} catch (BindingException e) {
-			throw new HistoryException( e );
-		} catch (AccessorException e) {
-			throw new HistoryException( e );
-		} 
-	}
-	
-	/**
-	 * Go to time using random access
-	 * @param time
-	 * @return true if sample was found
-	 * @throws HistoryException 
-	 */
-	public boolean gotoTime(double time) throws HistoryException {
-		// Outside range
-		if ( time<from || time>end ) {
-			index = -1;
-			return false;
-		}
-		
-		// Already at cursor
-		if ( time>=startTime && time<endTime ) return hasValue();
-		int i = stream.binarySearch(Bindings.DOUBLE, time);
-		if (i>=0) {
-			gotoIndex( i );
-		} else {
-			int insertPos = -i-2;
-			if ( insertPos<0 || insertPos>=size ) {
-				index = -1;
-			} else {
-				gotoIndex( insertPos );
-				if ( endTime<time ) index = -1;
-			}
-		}
-		
-		return hasValue();		
-	}
-	
-	/**
-	 * Proceed to time using sequential seek.
-	 * 
-	 * @param time
-	 * @return true if sample was found
-	 * @throws HistoryException 
-	 */
-	public boolean proceedToTime(double time) throws HistoryException {
-		// Outside range
-		if ( time<from || time>end ) {
-			index = -1;
-			return false;
-		}
-
-		// No position, or going to past
-		if (index<0 || startTime>time) {
-			gotoTime(time);
-			return hasValue();
-		}
-		
-		// Proceed until end hit
-		while (time>=endTime && hasNext()) gotoIndex(index+1);
-		return hasValue();
-	}
-	
-	/**
-	 * Go to index. If element does not exist, index is set to -1;
-	 * @param pos
-	 * @throws HistoryException
-	 */
-	public void gotoIndex(int pos) throws HistoryException {
-		if (pos == index) return;
-		
-		if (pos<0 || pos>=size) {
-			index = -1;
-			return;
-		}
-
-		try {
-			// Read current value
-			if (pos == index+1 && index>=0) {
-				sampleBinding.readFrom(sampleBinding, next, current);
-			} else {
-				aa.get(pos, sampleBinding, current);
-			}
-			startTime = valueBand.getTimeDouble();
-			
-			// Read next value
-			if (pos+1<size) {
-				aa.get(pos+1, sampleBinding, next);
-				//endTime = valueBand.isValidValue() ? nextValueBand.getTimeDouble() : ( nextValueBand.isValidValue() ? nextValueBand.getTimeDouble() : nextValueBand.getTimeDouble() );
-				endTime = nextValueBand.getTimeDouble();
-			} else {				
-				endTime = valueBand.hasEndTime() ? valueBand.getEndTimeDouble() : valueBand.getTimeDouble();
-			}
-			
-			// 
-			index = pos;
-		} catch (AccessorException e) {
-			throw new HistoryException( e );
-		} catch (BindingException e) {
-			throw new HistoryException( e );
-		}
-	}
-
-	
-	public boolean hasNext() {
-		return index<size-1;
-	}
-
-	public void next() throws HistoryException {
-		//if (index>=0) 
-		gotoIndex( index+1 );
-	}
-	
-	public ValueBand getValueBand() {
-		return valueBand;
-	}
-	
-	public Object getValue(Binding binding) throws HistoryException {
-		return valueBand.getValue(binding);
-	}
-	
-	public Object getSample() {
-		return current;
-	}
-	
-	public RecordBinding getSampleBinding() {
-		return sampleBinding;
-	}
-	
-	public boolean hasValue() {
-		return index!=-1;
-	}
-	
-	public boolean hasValidValue() throws HistoryException {
-		return index!=-1 && !valueBand.isNanSample() && !valueBand.isNullValue();
-	}
-	/**
-	 * Get the start time. The value is valid if index != -1
-	 * @return start time
-	 */
-	public double getStartTime() {
-		return startTime;
-	}
-	
-	/**
-	 * Get end time, the value is valid if index != -1
-	 * @return end time
-	 */
-	public double getEndTime() {
-		return endTime;
-	}
-	
-	public Double getNextTime() throws HistoryException {
-		if ( size==0 ) return null;
-		if ( index==-1 ) return from;
-		return (Double) nextValueBand.getTime(Bindings.DOUBLE);
-	}
-	
-	public Double getNextTime( double currentTime ) throws HistoryException {
-		if ( size==0 ) return null;
-		if ( index==-1 ) return from;
-		
-		if ( valueBand.hasEndTime() ) {
-			Double endTime = (Double) valueBand.getEndTime(Bindings.DOUBLE);
-			if ( endTime>currentTime ) return endTime;
-		}
-		
-		double nextTime = (Double) nextValueBand.getTime(Bindings.DOUBLE);
-		return nextTime;
-	}
-	
-	
-	
-	/**
-	 * get index of the cursor
-	 * @return index or -1
-	 */
-	public int getIndex() {
-		return index;
-	}
-	
-	@Override
-	public String toString() {
-		Binding valueBinding = valueBand.getValueBinding();
-		String valueStr;
-		try {
-			valueStr = valueBinding.toString( valueBand.getValue() );
-		} catch (BindingException e) {
-			valueStr = e.toString();
-		} catch (HistoryException e) {
-			valueStr = e.toString();
-		}
-		if ( hasValue() ) {
-			return "i="+index+", time=["+startTime+"-"+endTime+"], value="+valueStr;
-		} else {
-			return "<no value>";
-		}
-	}
-	
-	/**
-	 * Get start time of the first sample.
-	 * @return time
-	 */
-	public double getFirstTime() {
-		return from;
-	}
-	
-	/**
-	 * Get end time of the last sample.
-	 * @return time
-	 */
-	public double getLastTime() {
-		return end;
-	}
-	
-	public int size() {
-		return size;
-	}
-	
-	public boolean isEmpty() {
-		return size==0;
-	}
-	
-}
+/*******************************************************************************
+ * Copyright (c) 2007, 2012 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.history.util;
+
+import org.simantics.databoard.Bindings;
+import org.simantics.databoard.accessor.ArrayAccessor;
+import org.simantics.databoard.accessor.error.AccessorException;
+import org.simantics.databoard.binding.Binding;
+import org.simantics.databoard.binding.RecordBinding;
+import org.simantics.databoard.binding.error.BindingException;
+import org.simantics.history.HistoryException;
+
+/**
+ * Stream iterator iterates sample entries in an array.
+ * 
+ * Is scans the next sample and knows its time stamp.
+ * 
+ * @author toni.kalajainen
+ */
+public class StreamIterator {
+
+	// Sample binding
+	RecordBinding sampleBinding;
+	
+	// Array accessor
+	ArrayAccessor aa;
+	// Array stream
+	Stream stream;
+	// From and end times of the whole stream
+	double from, end;
+	
+	// Current and next sample
+	Object current, next;
+
+	// Utility for reading sample
+	ValueBand valueBand, nextValueBand;
+	// Start and end time of current sample
+	double startTime, endTime;
+	
+	int index = -1;
+	int size;
+	
+	public StreamIterator(ArrayAccessor aa) throws HistoryException {
+		try {
+			this.aa = aa;
+			sampleBinding = (RecordBinding) Bindings.getBeanBinding( aa.type().componentType );
+			current = sampleBinding.createDefault();
+			next = sampleBinding.createDefault();
+			valueBand = new ValueBand(sampleBinding, current);
+			nextValueBand = new ValueBand(sampleBinding, next);
+			stream = new Stream( aa, sampleBinding );
+			size = aa.size();
+			if ( size>0 ) {
+		    	aa.get(0, sampleBinding, current);
+				from = valueBand.getTimeDouble();
+		    	aa.get(size-1, sampleBinding, current);
+				end = valueBand.hasEndTime() ? valueBand.getEndTimeDouble() : valueBand.getTimeDouble();
+			}
+		} catch (BindingException e) {
+			throw new HistoryException( e );
+		} catch (AccessorException e) {
+			throw new HistoryException( e );
+		} 
+	}
+	
+	/**
+	 * Go to time using random access
+	 * @param time
+	 * @return true if sample was found
+	 * @throws HistoryException 
+	 */
+	public boolean gotoTime(double time) throws HistoryException {
+		// Outside range
+		if ( time<from || time>end ) {
+			index = -1;
+			return false;
+		}
+		
+		// Already at cursor
+		if ( time>=startTime && time<endTime ) return hasValue();
+		int i = stream.binarySearch(Bindings.DOUBLE, time);
+		if (i>=0) {
+			gotoIndex( i );
+		} else {
+			int insertPos = -i-2;
+			if ( insertPos<0 || insertPos>=size ) {
+				index = -1;
+			} else {
+				gotoIndex( insertPos );
+				if ( endTime<time ) index = -1;
+			}
+		}
+		
+		return hasValue();		
+	}
+	
+	/**
+	 * Proceed to time using sequential seek.
+	 * 
+	 * @param time
+	 * @return true if sample was found
+	 * @throws HistoryException 
+	 */
+	public boolean proceedToTime(double time) throws HistoryException {
+		// Outside range
+		if ( time<from || time>end ) {
+			index = -1;
+			return false;
+		}
+
+		// No position, or going to past
+		if (index<0 || startTime>time) {
+			gotoTime(time);
+			return hasValue();
+		}
+		
+		// Proceed until end hit
+		while (time>=endTime && hasNext()) gotoIndex(index+1);
+		return hasValue();
+	}
+	
+	/**
+	 * Go to index. If element does not exist, index is set to -1;
+	 * @param pos
+	 * @throws HistoryException
+	 */
+	public void gotoIndex(int pos) throws HistoryException {
+		if (pos == index) return;
+		
+		if (pos<0 || pos>=size) {
+			index = -1;
+			return;
+		}
+
+		try {
+			// Read current value
+			if (pos == index+1 && index>=0) {
+				sampleBinding.readFrom(sampleBinding, next, current);
+			} else {
+				aa.get(pos, sampleBinding, current);
+			}
+			startTime = valueBand.getTimeDouble();
+			
+			// Read next value
+			if (pos+1<size) {
+				aa.get(pos+1, sampleBinding, next);
+				//endTime = valueBand.isValidValue() ? nextValueBand.getTimeDouble() : ( nextValueBand.isValidValue() ? nextValueBand.getTimeDouble() : nextValueBand.getTimeDouble() );
+				endTime = nextValueBand.getTimeDouble();
+			} else {				
+				endTime = valueBand.hasEndTime() ? valueBand.getEndTimeDouble() : valueBand.getTimeDouble();
+			}
+			
+			// 
+			index = pos;
+		} catch (AccessorException e) {
+			throw new HistoryException( e );
+		} catch (BindingException e) {
+			throw new HistoryException( e );
+		}
+	}
+
+	
+	public boolean hasNext() {
+		return index<size-1;
+	}
+
+	public void next() throws HistoryException {
+		//if (index>=0) 
+		gotoIndex( index+1 );
+	}
+	
+	public ValueBand getValueBand() {
+		return valueBand;
+	}
+	
+	public Object getValue(Binding binding) throws HistoryException {
+		return valueBand.getValue(binding);
+	}
+	
+	public Object getSample() {
+		return current;
+	}
+	
+	public RecordBinding getSampleBinding() {
+		return sampleBinding;
+	}
+	
+	public boolean hasValue() {
+		return index!=-1;
+	}
+	
+	public boolean hasValidValue() throws HistoryException {
+		return index!=-1 && !valueBand.isNanSample() && !valueBand.isNullValue();
+	}
+	/**
+	 * Get the start time. The value is valid if index != -1
+	 * @return start time
+	 */
+	public double getStartTime() {
+		return startTime;
+	}
+	
+	/**
+	 * Get end time, the value is valid if index != -1
+	 * @return end time
+	 */
+	public double getEndTime() {
+		return endTime;
+	}
+	
+	public Double getNextTime() throws HistoryException {
+		if ( size==0 ) return null;
+		if ( index==-1 ) return from;
+		return (Double) nextValueBand.getTime(Bindings.DOUBLE);
+	}
+	
+	public Double getNextTime( double currentTime ) throws HistoryException {
+		if ( size==0 ) return null;
+		if ( index==-1 ) return from;
+		
+		if ( valueBand.hasEndTime() ) {
+			Double endTime = (Double) valueBand.getEndTime(Bindings.DOUBLE);
+			if ( endTime>currentTime ) return endTime;
+		}
+		
+		double nextTime = (Double) nextValueBand.getTime(Bindings.DOUBLE);
+		return nextTime;
+	}
+	
+	
+	
+	/**
+	 * get index of the cursor
+	 * @return index or -1
+	 */
+	public int getIndex() {
+		return index;
+	}
+	
+	@Override
+	public String toString() {
+		Binding valueBinding = valueBand.getValueBinding();
+		String valueStr;
+		try {
+			valueStr = valueBinding.toString( valueBand.getValue() );
+		} catch (BindingException e) {
+			valueStr = e.toString();
+		} catch (HistoryException e) {
+			valueStr = e.toString();
+		}
+		if ( hasValue() ) {
+			return "i="+index+", time=["+startTime+"-"+endTime+"], value="+valueStr;
+		} else {
+			return "<no value>";
+		}
+	}
+	
+	/**
+	 * Get start time of the first sample.
+	 * @return time
+	 */
+	public double getFirstTime() {
+		return from;
+	}
+	
+	/**
+	 * Get end time of the last sample.
+	 * @return time
+	 */
+	public double getLastTime() {
+		return end;
+	}
+	
+	public int size() {
+		return size;
+	}
+	
+	public boolean isEmpty() {
+		return size==0;
+	}
+	
+}