Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[6833] trunk/business/dodico-h2d
|
From: <de...@us...> - 2011-12-13 00:57:23
|
Revision: 6833
http://fudaa.svn.sourceforge.net/fudaa/?rev=6833&view=rev
Author: deniger
Date: 2011-12-13 00:57:17 +0000 (Tue, 13 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarSI.java
trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTimeCondition.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarIMAFileFormat.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarIMAReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOUVReader.java
trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOutReader.java
Modified: trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarSI.java
===================================================================
--- trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarSI.java 2011-12-13 00:56:10 UTC (rev 6832)
+++ trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarSI.java 2011-12-13 00:57:17 UTC (rev 6833)
@@ -292,11 +292,12 @@
}
if (listener_ != null) {
for (final Iterator it = listener_.iterator(); it.hasNext();) {
- ((H2dSIListener) it.next()).siChanged(_v);
+ H2dSIListener siListener = (H2dSIListener) it.next();
+ siListener.siChanged(_v);
if (_v == H2dVariableType.COTE_EAU) {
- ((H2dSIListener) it.next()).siChanged(H2dVariableType.HAUTEUR_EAU);
+ siListener.siChanged(H2dVariableType.HAUTEUR_EAU);
} else if (_v == H2dVariableType.HAUTEUR_EAU) {
- ((H2dSIListener) it.next()).siChanged(H2dVariableType.COTE_EAU);
+ siListener.siChanged(H2dVariableType.COTE_EAU);
}
}
}
Modified: trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTimeCondition.java
===================================================================
--- trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTimeCondition.java 2011-12-13 00:56:10 UTC (rev 6832)
+++ trunk/business/dodico-h2d/core/src/main/java/org/fudaa/dodico/h2d/rubar/H2dRubarTimeCondition.java 2011-12-13 00:57:17 UTC (rev 6833)
@@ -44,7 +44,7 @@
VAR_FORMAT.put(H2dVariableType.DEBIT_TANGENTIEL, fmt);
VAR_FORMAT.put(H2dVariableType.DEBIT, fmt);
VAR_FORMAT.put(H2dVariableType.DEBIT_NORMAL, fmt);
- fmt = FortranLib.getFormater(10, 7, true);
+ fmt = FortranLib.getFormater(10, 7, false);
VAR_FORMAT.put(H2dVariableTransType.CONCENTRATION, fmt);
fmt = FortranLib.getFormater(15, 4, true);
VAR_FORMAT.put(H2dVariableTransType.APPORT_PLUIE, fmt);
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarIMAFileFormat.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarIMAFileFormat.java 2011-12-13 00:56:10 UTC (rev 6832)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarIMAFileFormat.java 2011-12-13 00:57:17 UTC (rev 6833)
@@ -7,11 +7,18 @@
*/
package org.fudaa.dodico.rubar.io;
+import java.io.File;
+
+import org.fudaa.ctulu.CtuluIOOperationSynthese;
import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.fileformat.FileReadOperationAbstract;
import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
+import org.fudaa.dodico.ef.EfGridInterface;
+import org.fudaa.dodico.ef.EfGridSource;
import org.fudaa.dodico.ef.FileFormatGridVersionAbstract;
+import org.fudaa.dodico.ef.impl.EfGridSourceDefaut;
import org.fudaa.dodico.h2d.resource.H2dResource;
/**
@@ -37,6 +44,19 @@
return instance_;
}
+ public CtuluIOOperationSynthese readGrid(final File _f, final ProgressionInterface _prog) {
+ final CtuluIOOperationSynthese s = read(_f, _prog);
+ if (s.getSource() != null) {
+ final EfGridSourceDefaut r = new EfGridSourceDefaut((EfGridInterface) s.getSource(), this);
+ s.setSource(r);
+ }
+ return s;
+ }
+
+ public CtuluIOOperationSynthese writeGrid(final File _f, final EfGridSource _m, final ProgressionInterface _prog) {
+ return write(_f, _m == null ? null : _m.getGrid(), _prog);
+ }
+
/**
* Initialise toutes les donnees.
*/
@@ -56,19 +76,16 @@
return new RubarIMAWriter();
}
- public boolean canReadGrid()
- {
- return true;
+ public boolean canReadGrid() {
+ return true;
}
-
- public boolean canWriteGrid()
- {
- return true;
+
+ public boolean canWriteGrid() {
+ return true;
}
-
- public boolean hasBoundaryConditons()
- {
- // TODO Voir si correct
- return false;
+
+ public boolean hasBoundaryConditons() {
+ // TODO Voir si correct
+ return false;
}
}
\ No newline at end of file
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarIMAReader.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarIMAReader.java 2011-12-13 00:56:10 UTC (rev 6832)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarIMAReader.java 2011-12-13 00:57:17 UTC (rev 6833)
@@ -1,5 +1,7 @@
package org.fudaa.dodico.rubar.io;
+import gnu.trove.TIntArrayList;
+
import java.io.EOFException;
import java.io.IOException;
import java.util.ArrayList;
@@ -30,7 +32,9 @@
public int compare(double x1, double y1, double x2, double y2) {
final int result = compare(x1, x2);
- if (result == 0) { return compare(y1, y2); }
+ if (result == 0) {
+ return compare(y1, y2);
+ }
return result;
}
@@ -38,7 +42,9 @@
private static int compare(double d1, double d2) {
if ((d1 > (d2 - epsilon)) && (d1 < (d2 + epsilon))) {
return 0;
- } else if (d1 < d2) { return -1; }
+ } else if (d1 < d2) {
+ return -1;
+ }
return 1;
}
@@ -162,7 +168,7 @@
final double deltaY = Math.abs(ys[0] - ys[divider]) / divider;
final int factorX = (xs[0] < xs[divider]) ? 1 : -1;
final int factorY = (ys[0] < ys[divider]) ? 1 : -1;
-
+
for (int i = 1; i < divider; i++) {
xs[i] = xs[0] + (i * factorX * deltaX);
ys[i] = ys[0] + (i * factorY * deltaY);
@@ -199,17 +205,21 @@
for (int i = 0; i < length1 - 1; i++) {
for (int j = 0; j < length2 - 1; j++) {
- EfElement element;
-
// Triangle
- if (nodes[i][j] == nodes[i + 1][j]) {
- element = new EfElement(new int[] { nodes[i][j], nodes[i][j + 1], nodes[i + 1][j + 1] });
- } else {
- element = new EfElement(new int[] { nodes[i][j], nodes[i][j + 1], nodes[i + 1][j + 1], nodes[i + 1][j] });
- }
-
+ TIntArrayList idxList = new TIntArrayList();
+ idxList.add(nodes[i][j]);
+ addIfNotPresent(idxList, nodes[i][j + 1]);
+ addIfNotPresent(idxList, nodes[i + 1][j + 1]);
+ addIfNotPresent(idxList, nodes[i + 1][j]);
+ EfElement element = new EfElement(idxList.toNativeArray());
elements.add(element);
}
}
}
+
+ private void addIfNotPresent(TIntArrayList idxList, int idx) {
+ if (!idxList.contains(idx)) {
+ idxList.add(idx);
+ }
+ }
}
\ No newline at end of file
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOUVReader.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOUVReader.java 2011-12-13 00:56:10 UTC (rev 6832)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOUVReader.java 2011-12-13 00:57:17 UTC (rev 6833)
@@ -30,6 +30,7 @@
final List ouv = new ArrayList();
in_.setBlankZero(true);
+ in_.setJumpBlankLine(true);
try {
while (true) {
final RubarOuvrage o = new RubarOuvrage();
Modified: trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOutReader.java
===================================================================
--- trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOutReader.java 2011-12-13 00:56:10 UTC (rev 6832)
+++ trunk/business/dodico-h2d/io/src/main/java/org/fudaa/dodico/rubar/io/RubarOutReader.java 2011-12-13 00:57:17 UTC (rev 6833)
@@ -110,7 +110,7 @@
return null;
}
RubarOutEdgeResult res = (RubarOutEdgeResult) res_.get(idxA);
- if (res == null && !isReadConcentration()) {
+ if (res == null ) {
res = readEdgeResult();
final boolean conforme = res.setRef(in_.intField(7));
if (!conforme) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
