Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8161] trunk/business/fudaa-ef
|
From: <de...@us...> - 2012-12-20 14:04:22
|
Revision: 8161
http://fudaa.svn.sourceforge.net/fudaa/?rev=8161&view=rev
Author: deniger
Date: 2012-12-20 14:04:14 +0000 (Thu, 20 Dec 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGrid.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinNewReader.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinWriter.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleEleNodeGridCreator.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeAdapter.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeDataDefault.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeDataInterface.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeWriter.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangulationPolyDataNodeDefault.java
trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeAdapterTest.java
trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeReaderTest.java
trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeWriterTest.java
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGrid.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGrid.java 2012-12-20 14:03:22 UTC (rev 8160)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGrid.java 2012-12-20 14:04:14 UTC (rev 8161)
@@ -11,7 +11,6 @@
*/
package org.fudaa.dodico.ef.impl;
-import com.vividsolutions.jts.geom.Envelope;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.ProgressionUpdater;
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinNewReader.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinNewReader.java 2012-12-20 14:03:22 UTC (rev 8160)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinNewReader.java 2012-12-20 14:04:14 UTC (rev 8161)
@@ -16,6 +16,7 @@
import java.util.Calendar;
import com.memoire.fu.FuVectordouble;
+import java.io.InputStream;
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluLibMessage;
@@ -422,7 +423,6 @@
} catch (final FileNotFoundException _e) {
analyze_.manageException(_e);
}
-
}
public long getReadTimeStepFrom() {
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinWriter.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinWriter.java 2012-12-20 14:03:22 UTC (rev 8160)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinWriter.java 2012-12-20 14:04:14 UTC (rev 8161)
@@ -89,9 +89,13 @@
return false;
}
- private void setOut(final OutputStream _out) {
+ public void setOut(final OutputStream _out) {
out_ = _out;
+ if (analyze_ == null) {
+ analyze_ = new CtuluAnalyze();
+ }
}
+
private void setProgression(final long _etat) {
if (progress_ != null) {
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleEleNodeGridCreator.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleEleNodeGridCreator.java 2012-12-20 14:03:22 UTC (rev 8160)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleEleNodeGridCreator.java 2012-12-20 14:04:14 UTC (rev 8161)
@@ -51,13 +51,13 @@
}
CtuluIOResult<EFGridArrayZ> createGrid(TriangleNodeDataInterface nodes, TriangleEleDataDefault elts) {
- EfNode[] efNodes = new EfNode[nodes.getNbPoints()];
+ EfNode[] efNodes = new EfNode[nodes.getPtsNb()];
boolean useZ = useFirstAttributesAsZ && nodes.getNbAttributes() >= 1;
ProgressionUpdater updater = new ProgressionUpdater(progression);
updater.setValue(10, efNodes.length);
updater.majProgessionStateOnly(EfIOResource.getS("Cr\xE9ation des noeuds"));
for (int idxNode = 0; idxNode < efNodes.length; idxNode++) {
- efNodes[idxNode] = new EfNode(nodes.getX(idxNode), nodes.getY(idxNode), useZ ? nodes.getAttributes(idxNode, 0) : 0);
+ efNodes[idxNode] = new EfNode(nodes.getPtX(idxNode), nodes.getPtY(idxNode), useZ ? nodes.getAttributes(idxNode, 0) : 0);
updater.majAvancement();
}
BitSet usedNode = new BitSet();
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeAdapter.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeAdapter.java 2012-12-20 14:03:22 UTC (rev 8160)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeAdapter.java 2012-12-20 14:04:14 UTC (rev 8161)
@@ -13,23 +13,11 @@
*/
public class TriangleNodeAdapter extends GisZoneCollectionAsListPointAdapter implements TriangleNodeDataInterface {
-
public TriangleNodeAdapter(GISZoneCollection points) {
super(points);
}
-
@Override
- public double getX(int idxPt) {
- return getCoordinate(idxPt).x;
- }
-
- @Override
- public double getY(int idxPt) {
- return getCoordinate(idxPt).y;
- }
-
- @Override
public int getNbAttributes() {
return 0;
}
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeDataDefault.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeDataDefault.java 2012-12-20 14:03:22 UTC (rev 8160)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeDataDefault.java 2012-12-20 14:04:14 UTC (rev 8161)
@@ -30,17 +30,17 @@
}
@Override
- public int getNbPoints() {
+ public int getPtsNb() {
return x.length;
}
@Override
- public double getX(int idxPt) {
+ public double getPtX(int idxPt) {
return x[idxPt];
}
@Override
- public double getY(int idxPt) {
+ public double getPtY(int idxPt) {
return y[idxPt];
}
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeDataInterface.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeDataInterface.java 2012-12-20 14:03:22 UTC (rev 8160)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeDataInterface.java 2012-12-20 14:04:14 UTC (rev 8161)
@@ -10,21 +10,21 @@
*/
public interface TriangleNodeDataInterface {
- int getNbPoints();
+ int getPtsNb();
/**
*
* @param idxPt entre 0 et getNbPoint-1
* @return x
*/
- double getX(int idxPt);
+ double getPtX(int idxPt);
/**
*
* @param idxPt entre 0 et getNbPoint-1
* @return y
*/
- double getY(int idxPt);
+ double getPtY(int idxPt);
/**
*
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeWriter.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeWriter.java 2012-12-20 14:03:22 UTC (rev 8160)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeWriter.java 2012-12-20 14:04:14 UTC (rev 8161)
@@ -40,7 +40,7 @@
analyze_.addFatalError(DodicoLib.getS("Le flux de sortie est nul"));
return;
}
- final int nbPoints = triangleNodeDataInterface.getNbPoints();
+ final int nbPoints = triangleNodeDataInterface.getPtsNb();
//premiere ligne
// First line: <# of vertices> <dimension (must be 2)> <# of attributes> <# of boundary markers (0 or 1)>
out_.write(Integer.toString(nbPoints));
@@ -65,9 +65,9 @@
for (int i = 0; i < nbPoints; i++) {
out_.write(Integer.toString(i + 1));
writeSpace();
- out_.write(Double.toString(triangleNodeDataInterface.getX(i)));
+ out_.write(Double.toString(triangleNodeDataInterface.getPtX(i)));
writeSpace();
- out_.write(Double.toString(triangleNodeDataInterface.getY(i)));
+ out_.write(Double.toString(triangleNodeDataInterface.getPtY(i)));
if (nbAttributes > 0) {
for (int k = 0; k < nbAttributes; k++) {
writeSpace();
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangulationPolyDataNodeDefault.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangulationPolyDataNodeDefault.java 2012-12-20 14:03:22 UTC (rev 8160)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/triangle/TriangulationPolyDataNodeDefault.java 2012-12-20 14:04:14 UTC (rev 8161)
@@ -23,17 +23,17 @@
@Override
public int getNbPoints() {
- return nodeData == null ? 0 : nodeData.getNbPoints();
+ return nodeData == null ? 0 : nodeData.getPtsNb();
}
@Override
public double getPtX(int idxPt) {
- return nodeData.getX(idxPt);
+ return nodeData.getPtX(idxPt);
}
@Override
public double getPtY(int idxPt) {
- return nodeData.getY(idxPt);
+ return nodeData.getPtY(idxPt);
}
public double getPtAttributes(int idxPt, int idxAtt) {
Modified: trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeAdapterTest.java
===================================================================
--- trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeAdapterTest.java 2012-12-20 14:03:22 UTC (rev 8160)
+++ trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeAdapterTest.java 2012-12-20 14:04:14 UTC (rev 8161)
@@ -42,10 +42,10 @@
seq = GISGeometryFactory.INSTANCE.getCoordinateSequenceFactory().create(cs2);
multiPoint.addCoordinateSequence(seq, null, null);
TriangleNodeAdapter adapter = new TriangleNodeAdapter(multiPoint);
- assertEquals(cs1.length + cs2.length, adapter.getNbPoints());
+ assertEquals(cs1.length + cs2.length, adapter.getPtsNb());
for (int i = 0; i < all.size(); i++) {
- assertEquals(all.get(i).x, adapter.getX(i), 1e-10);
- assertEquals(all.get(i).y, adapter.getY(i), 1e-10);
+ assertEquals(all.get(i).x, adapter.getPtX(i), 1e-10);
+ assertEquals(all.get(i).y, adapter.getPtY(i), 1e-10);
}
}
Modified: trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeReaderTest.java
===================================================================
--- trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeReaderTest.java 2012-12-20 14:03:22 UTC (rev 8160)
+++ trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeReaderTest.java 2012-12-20 14:04:14 UTC (rev 8161)
@@ -22,7 +22,7 @@
CtuluIOResult<TriangleNodeDataInterface> read = reader.read();
final TriangleNodeDataInterface source = read.getSource();
assertNotNull(source);
- assertEquals(1775, source.getNbPoints());
+ assertEquals(1775, source.getPtsNb());
assertEquals(1, source.getNbAttributes());
assertTrue(source.containsBoundaryMarkers());
//les markers
@@ -33,10 +33,10 @@
assertDoubleEquals(10, source.getAttributes(0,0));
assertDoubleEquals(10.26, source.getAttributes(1774,0));
//les X
- assertDoubleEquals(753, source.getX(0));
- assertDoubleEquals(322.29000000000002, source.getX(1774));
+ assertDoubleEquals(753, source.getPtX(0));
+ assertDoubleEquals(322.29000000000002, source.getPtX(1774));
//les Y
- assertDoubleEquals(437, source.getY(0));
- assertDoubleEquals(427, source.getY(1774));
+ assertDoubleEquals(437, source.getPtY(0));
+ assertDoubleEquals(427, source.getPtY(1774));
}
}
Modified: trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeWriterTest.java
===================================================================
--- trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeWriterTest.java 2012-12-20 14:03:22 UTC (rev 8160)
+++ trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/triangle/TriangleNodeWriterTest.java 2012-12-20 14:04:14 UTC (rev 8161)
@@ -36,7 +36,7 @@
source = read.getSource();
assertNotNull(source);
- assertEquals(1775, source.getNbPoints());
+ assertEquals(1775, source.getPtsNb());
assertEquals(1, source.getNbAttributes());
assertTrue(source.containsBoundaryMarkers());
//les markers
@@ -47,10 +47,10 @@
assertDoubleEquals(10, source.getAttributes(0, 0));
assertDoubleEquals(10.26, source.getAttributes(1774, 0));
//les X
- assertDoubleEquals(753, source.getX(0));
- assertDoubleEquals(322.29000000000002, source.getX(1774));
+ assertDoubleEquals(753, source.getPtX(0));
+ assertDoubleEquals(322.29000000000002, source.getPtX(1774));
//les Y
- assertDoubleEquals(437, source.getY(0));
- assertDoubleEquals(427, source.getY(1774));
+ assertDoubleEquals(437, source.getPtY(0));
+ assertDoubleEquals(427, source.getPtY(1774));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
