ADD: BIO measures rely on the new reuseOrCreateAndCalculateNewCache()

Author: xulman

src/main/java/net/celltrackingchallenge/measures/BCi.java

@@ -180,20 +180,8 @@ public double calculate(final String gtPath, final String resPath,
 	                        final TrackDataCache _cache)
 	throws IOException, ImgIOException
 	{
-		//invalidate own cache
-		cache = null;
-
-		//check we got some hint/cache
-		//and if it fits our input, then use it
-		if (_cache != null && _cache.validFor(gtPath,resPath)) cache = _cache;
-
-		//if no cache is available after all, compute it
-		if (cache == null)
-		{
-			//do the upper stage
-			cache = new TrackDataCache(log);
-			cache.calculate(gtPath,resPath);
-		}
+		//obtain a cache
+		cache = TrackDataCache.reuseOrCreateAndCalculateNewCache(_cache,gtPath,resPath,log);
 
 		//do the bottom stage
 		//DEBUG//log.info("Computing the BCi bottom part...");

src/main/java/net/celltrackingchallenge/measures/CCA.java

@@ -93,20 +93,8 @@ public double calculate(final String gtPath, final String resPath,
 	                        final TrackDataCache _cache)
 	throws IOException, ImgIOException
 	{
-		//invalidate own cache
-		cache = null;
-
-		//check we got some hint/cache
-		//and if it fits our input, then use it
-		if (_cache != null && _cache.validFor(gtPath,resPath)) cache = _cache;
-
-		//if no cache is available after all, compute it
-		if (cache == null)
-		{
-			//do the upper stage
-			cache = new TrackDataCache(log);
-			cache.calculate(gtPath,resPath);
-		}
+		//obtain a cache
+		cache = TrackDataCache.reuseOrCreateAndCalculateNewCache(_cache,gtPath,resPath,log);
 
 		//do the bottom stage
 		//DEBUG//log.info("Computing the CCA bottom part...");

src/main/java/net/celltrackingchallenge/measures/CT.java

@@ -155,20 +155,8 @@ public double calculate(final String gtPath, final String resPath,
 	                        final TrackDataCache _cache)
 	throws IOException, ImgIOException
 	{
-		//invalidate own cache
-		cache = null;
-
-		//check we got some hint/cache
-		//and if it fits our input, then use it
-		if (_cache != null && _cache.validFor(gtPath,resPath)) cache = _cache;
-
-		//if no cache is available after all, compute it
-		if (cache == null)
-		{
-			//do the upper stage
-			cache = new TrackDataCache(log);
-			cache.calculate(gtPath,resPath);
-		}
+		//obtain a cache
+		cache = TrackDataCache.reuseOrCreateAndCalculateNewCache(_cache,gtPath,resPath,log);
 
 		//do the bottom stage
 		//DEBUG//log.info("Computing the CT bottom part...");

src/main/java/net/celltrackingchallenge/measures/TF.java

@@ -236,20 +236,8 @@ public double calculate(final String gtPath, final String resPath,
 	                        final TrackDataCache _cache)
 	throws IOException, ImgIOException
 	{
-		//invalidate own cache
-		cache = null;
-
-		//check we got some hint/cache
-		//and if it fits our input, then use it
-		if (_cache != null && _cache.validFor(gtPath,resPath)) cache = _cache;
-
-		//if no cache is available after all, compute it
-		if (cache == null)
-		{
-			//do the upper stage
-			cache = new TrackDataCache(log);
-			cache.calculate(gtPath,resPath);
-		}
+		//obtain a cache
+		cache = TrackDataCache.reuseOrCreateAndCalculateNewCache(_cache,gtPath,resPath,log);
 
 		//do the bottom stage
 		//DEBUG//log.info("Computing the TF bottom part...");