[Fudaa-svn-commit] SF.net SVN: fudaa:[7584] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fudaa/tr/post

[<de...@us...>]

Revision: 7584
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7584&view=rev
Author:   deniger
Date:     2012-08-28 12:48:04 +0000 (Tue, 28 Aug 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceRubar.java
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceRubarMaxContainer.java

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceRubar.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceRubar.java	2012-08-28 09:31:04 UTC (rev 7583)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceRubar.java	2012-08-28 12:48:04 UTC (rev 7584)
@@ -173,7 +173,7 @@
           if (exposeTimeInitTime_.containsKey(_timeIdx)) {
             ok = tpcReader_.read(exposeTimeInitTime_.get(_timeIdx), tpcValues_);
           } else {
-            getMaxContainer(_timeIdx).getValueTPC(tpcValues_, tpcReader_);
+            getMaxContainer(_timeIdx).getValues(tpcValues_, tpcReader_);
           }
         } else {
           ok = tpcReader_.read(_timeIdx, tpcValues_);
@@ -327,18 +327,18 @@
         initValues[0][i] = g_.getPtZ(i);
       }
     } else {
-      if (!useEnvTime_ || (exposeTimeInitTime_ == null) || (exposeTimeInitTime_.containsKey(_timeIdx))) {
-        int idxTime = _timeIdx;
-        if (exposeTimeInitTime_ != null) {
-          idxTime = exposeTimeInitTime_.get(_timeIdx);
+      if (useEnvTime_ && exposeTimeExtrapolValues_ != null) {
+        if (exposeTimeInitTime_.containsKey(_timeIdx)) {
+          zfnReader_.read(exposeTimeInitTime_.get(_timeIdx), initValues);
+        } else {
+          final TrPostSourceRubarMaxContainer c = getMaxContainer(_timeIdx);
+          if (c == null) {
+            return null;
+          }
+          c.getValueZFN(initValues, zfnReader_);
         }
-        zfnReader_.read(idxTime, initValues);
       } else {
-        final TrPostSourceRubarMaxContainer c = getMaxContainer(_timeIdx);
-        if (c == null) {
-          return null;
-        }
-        c.getValueZFN(initValues, zfnReader_);
+        zfnReader_.read(_timeIdx, initValues);
       }
     }
     return initValues;
@@ -349,20 +349,18 @@
       return zfnValues_[idxPt];
     }
     try {
-      if (!useEnvTime_ || (exposeTimeInitTime_ == null) || (exposeTimeInitTime_.containsKey(_timeIdx))) {
-        int idxTime = _timeIdx;
-        if (exposeTimeInitTime_ != null) {
-          idxTime = exposeTimeInitTime_.get(_timeIdx);
+      if (useEnvTime_ && exposeTimeExtrapolValues_ != null) {
+        if (exposeTimeInitTime_.containsKey(_timeIdx)) {
+          return zfnReader_.read(0, exposeTimeInitTime_.get(_timeIdx), idxPt);
+        } else {
+          final TrPostSourceRubarMaxContainer c = getMaxContainer(_timeIdx);
+          if (c == null) {
+            return -1;
+          }
+          c.getValueZFN(idxPt, zfnReader_);
         }
-        double valeur = zfnReader_.read(0, idxTime, idxPt);
-        return valeur;
       } else {
-        final TrPostSourceRubarMaxContainer c = getMaxContainer(_timeIdx);
-        if (c == null) {
-          return -1;
-        }
-        return c.getValueZFN(idxPt, zfnReader_);
-
+        return zfnReader_.read(0, _timeIdx, idxPt);
       }
 
     } catch (final IOException _e) {

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceRubarMaxContainer.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceRubarMaxContainer.java	2012-08-28 09:31:04 UTC (rev 7583)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/TrPostSourceRubarMaxContainer.java	2012-08-28 12:48:04 UTC (rev 7584)
@@ -195,7 +195,7 @@
     }
   }
 
-  protected void getValueTPC(final double[][] _d, final RubarSolutionSequentielReader _tpcReader) throws IOException {
+  protected void getValues(final double[][] _d, final RubarSolutionSequentielReader _tpcReader) throws IOException {
     if (outOfBound_) {
       _tpcReader.read(tInfInTPC_, _d);
     } else {
@@ -215,7 +215,7 @@
   }
 
   protected void getValueZFN(final double[][] _d, final RubarSolutionSequentielReader _zfnReader) throws IOException {
-    getValueTPC(_d, _zfnReader);
+    getValues(_d, _zfnReader);
   }
 
   /*

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.