Menu
▾
▴
fudaa-svn-commit
|
From: <de...@us...> - 2009-10-14 16:24:55
|
Revision: 5261
http://fudaa.svn.sourceforge.net/fudaa/?rev=5261&view=rev
Author: deniger
Date: 2009-10-14 16:24:47 +0000 (Wed, 14 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/fudaa-ef/pom.xml
Removed Paths:
-------------
trunk/business/fudaa-ef/client/
Property Changed:
----------------
trunk/business/fudaa-ef/
trunk/business/fudaa-ef/core/
trunk/business/fudaa-ef/io/
Property changes on: trunk/business/fudaa-ef
___________________________________________________________________
Added: svn:ignore
+ target
.project
Property changes on: trunk/business/fudaa-ef/core
___________________________________________________________________
Added: svn:ignore
+ target
.classpath
.project
Property changes on: trunk/business/fudaa-ef/io
___________________________________________________________________
Added: svn:ignore
+ target
.classpath
.project
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2009-10-14 16:23:05 UTC (rev 5260)
+++ trunk/business/fudaa-ef/pom.xml 2009-10-14 16:24:47 UTC (rev 5261)
@@ -21,7 +21,9 @@
<modules>
<module>io</module>
<module>core</module>
- <module>client</module>
+ <!--
+ <module>client</module> a decommenter des que dependences résolues
+ -->
</modules>
<dependencyManagement>
<dependencies>
@@ -42,11 +44,11 @@
<artifactId>io</artifactId>
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.fudaa.business.ef</groupId>
- <artifactId>client</artifactId>
- <version>${version}</version>
- </dependency>
+ <!-- <dependency>-->
+ <!-- <groupId>org.fudaa.business.ef</groupId>-->
+ <!-- <artifactId>client</artifactId>-->
+ <!-- <version>${version}</version>-->
+ <!-- </dependency>-->
</dependencies>
</dependencyManagement>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-10-15 14:00:22
|
Revision: 5277
http://fudaa.svn.sourceforge.net/fudaa/?rev=5277&view=rev
Author: chrisc83
Date: 2009-10-15 14:00:07 +0000 (Thu, 15 Oct 2009)
Log Message:
-----------
IN PROGRESS - issue PREPRO-39: D?\195?\169coupage des ?\195?\169l?\195?\169ments en 4
http://www.fudaa.fr/jira/browse/PREPRO-39
Modified Paths:
--------------
trunk/business/fudaa-ef/core/.settings/org.eclipse.jdt.core.prefs
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/refine/EfOperationRefineEdge.java
Added Paths:
-----------
trunk/business/fudaa-ef/.project
trunk/business/fudaa-ef/core/.classpath
trunk/business/fudaa-ef/core/.project
trunk/business/fudaa-ef/core/.settings/org.eclipse.jdt.ui.prefs
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/ctulu/
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/ctulu/CtuluAnalyze.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/ctulu/CtuluDefaultLogFormatter.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/ctulu/DebugFormater.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/ef.properties
trunk/business/fudaa-ef/core/target/
trunk/business/fudaa-ef/core/target/classes/
trunk/business/fudaa-ef/core/target/classes/org/
trunk/business/fudaa-ef/core/target/classes/org/fudaa/
trunk/business/fudaa-ef/core/target/classes/org/fudaa/ctulu/
trunk/business/fudaa-ef/core/target/classes/org/fudaa/ctulu/CtuluAnalyze.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/ctulu/CtuluDefaultLogFormatter.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/ctulu/DebugFormater.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/AllFrontierIteratorInterface.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfData.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfDataAdapter.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfDataElement.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfDataInterpolationAdapter$Norm.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfDataInterpolationAdapter$Theta.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfDataInterpolationAdapter.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfDataNode.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfElement.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfElementType.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfElementVolume.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfFilter.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfFilterNone.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfFilterSelectedElement.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfFilterSelectedNode.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfFilterTime.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfFrontierInterface.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfGridData.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfGridDataInterpolationValuesAdapter.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfGridInterface.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfGridSource.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfGridVolumeInterface.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfIndexInterface.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfIndexVisitor.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfLib.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfNeighborMesh.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfNode.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfNodeMutable.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfSegment.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfSegmentMutable.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/EfVoisinageFinderActivity.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/FileFormatGridVersion.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/FileFormatGridVersionAbstract.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/cubature/
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/cubature/EfBilanHelper.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/cubature/EfComputeVolume$ForMeshData.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/cubature/EfComputeVolume$ForNodeData.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/cubature/EfComputeVolume.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/cubature/EfComputeVolumeSeuil$ForMeshData.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/cubature/EfComputeVolumeSeuil$ForNodeData.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/cubature/EfComputeVolumeSeuil.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/cubature/EfDataIntegrale.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/decorator/
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/decorator/AbstractEfGridDataDecorator.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/decorator/EfGridDataCacheOneTimeDecorator.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/decorator/EfGridDataCacheSoftReferenceDecorator.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/decorator/EfGridDataOneTimeDecorator.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/decorator/EfGridDataRenumeroteDecorator.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/decorator/EfGridDataT64T3Decorator.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/decorator/EfGridDataTimeDecorator.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/decorator/EfGridDataToT6Decorator.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/decorator/EfGridDataTranslateDecorator.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/decorator/EfSwapListManager.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/ef.properties
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EFGridArrayZ.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfDataStatisticEvaluator$Max.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfDataStatisticEvaluator$Min.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfDataStatisticEvaluator$Moyenne.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfDataStatisticEvaluator.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfFoundSegment.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfFrontier$AllFrontiereIterator.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfFrontier$FrontierIterator.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfFrontier.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGrid.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridAbstract.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridArray.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridBathyAdapter.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridDataDefault.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridDefaultAbstract$1.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridDefaultAbstract$2.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridDefaultAbstract$3.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridDefaultAbstract$4.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridDefaultAbstract$5.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridDefaultAbstract$6.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridDefaultAbstract.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridGisAdapter.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridMutable.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridRedispatched.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridSourceDefaut.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridSourceMutable.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridSourcesAbstract.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridTranslate.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridVolume.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfGridVolumeArray.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfLibImpl.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/EfRefinedGridAddedPt.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/impl/FrontierIteratorInterface.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/interpolation/
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/interpolation/EfGridDataInterpolator.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/interpolation/EfInterpolationGridSupportAdapter$Mesh.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/interpolation/EfInterpolationGridSupportAdapter$Node.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/interpolation/EfInterpolationGridSupportAdapter.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/interpolation/EfInterpolationTargetGridAdapter.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/interpolation/EfInterpolator.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/AbstractEfOperation.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfComparator$ElementMaxX.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfComparator$ElementMaxY.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfComparator$ElementMinX.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfComparator$ElementMinY.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfComparator.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfIndexHelper.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfIndexRegular.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfIndexVisitorHashSet.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfIndexVisitorHashSetNode.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfIndexVisitorNearestElt.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfIndexVisitorNearestNode.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfIndexVisitorNodeSelect.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfIndexerActivity.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfIsoActivity.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfIsoActivitySearcher$ArrayListWithIndex.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfIsoActivitySearcher$TempResult.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfIsoActivitySearcher.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfIsoRestructuredGridActivity.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfIsoRestructuredGridResult.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfIsoResultDefault.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfIsoResultInterface.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineFlowrateResult$Compute.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineFlowrateResult.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersection$ItemEdge.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersection$ItemInitial.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersection$ItemMesh.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersection$ItemNoIntersect.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersection$ItemNode.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersection.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersectionI.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersectionParent.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersectionParentDefault.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersectionsCorrectionActivity$AdapterResults.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersectionsCorrectionActivity.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersectionsCorrectionTester.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersectionsResultsBuilder.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersectionsResultsDefault.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersectionsResultsI.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersectionsResultsMng$DistComparator.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersectionsResultsMng$Initial.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersectionsResultsMng.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersectorActivity$TempResult.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineIntersectorActivity.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfLineSingleIntersectFinder.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfOperation.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfOperationResult.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfTrajectoireActivity.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfTrajectoireGridDataProvider$LigneDeCourant.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfTrajectoireGridDataProvider$Trajectoire.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfTrajectoireGridDataProvider.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfTrajectoireMarqueurBuilder$Geo.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfTrajectoireMarqueurBuilder$Time.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfTrajectoireMarqueurBuilder.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfTrajectoireParameters.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfTrajectoireParametersMarqueur.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/EfTrajectoireResultBuilder.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/clean/
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/clean/EfOperationCleanGrid.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/overstressed/
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/overstressed/EfFindEdgeToSwap.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/overstressed/EfOperationOverstressed.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/overstressed/EfOperationSwapSelectedEdge$EfGridDataFromSwapSelectedEdge.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/overstressed/EfOperationSwapSelectedEdge.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/refine/
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/refine/EfOperationRefine$EfGridDataFromRefine.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/refine/EfOperationRefine.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/refine/EfOperationRefineEdge$EfGridDataFromRefineEdge.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/refine/EfOperationRefineEdge.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/refine/EfOperationRefineEdge.java.mine
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/refine/EfOperationRefineEdge.java.r5257
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/refine/EfOperationRefineEdge.java.r5276
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/refine/EfRefinementMiddleActivity.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/refine/EfRefinementMiddleResult.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/renum/
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/renum/EfOperationBackElimination.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/renum/EfOperationRenumeration.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/renum/EfOperationShufle.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/type/
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/type/EfOperationToT3.class
trunk/business/fudaa-ef/core/target/classes/org/fudaa/dodico/ef/operation/type/EfOperationToT6.class
trunk/business/fudaa-ef/core/target/core-1.0-SNAPSHOT-sources.jar
trunk/business/fudaa-ef/core/target/core-1.0-SNAPSHOT.jar
trunk/business/fudaa-ef/core/target/maven-archiver/
trunk/business/fudaa-ef/core/target/maven-archiver/pom.properties
trunk/business/fudaa-ef/core/target/surefire-reports/
trunk/business/fudaa-ef/core/target/surefire-reports/TEST-org.fudaa.dodico.ef.TestJLineIntersection.xml
trunk/business/fudaa-ef/core/target/surefire-reports/TEST-org.fudaa.dodico.ef.TestJSearchInGrid.xml
trunk/business/fudaa-ef/core/target/surefire-reports/TEST-org.fudaa.dodico.ef.TestJSearchIso.xml
trunk/business/fudaa-ef/core/target/surefire-reports/TEST-org.fudaa.dodico.ef.decorator.TestEfSwapListManager.xml
trunk/business/fudaa-ef/core/target/surefire-reports/TEST-org.fudaa.dodico.ef.operation.overstressed.TestEfFindEdgeToSwap.xml
trunk/business/fudaa-ef/core/target/surefire-reports/TEST-org.fudaa.dodico.ef.operation.overstressed.TestEfOperationOverstressed.xml
trunk/business/fudaa-ef/core/target/surefire-reports/TEST-org.fudaa.dodico.ef.operation.overstressed.TestEfOperationSwapSelectedEdge.xml
trunk/business/fudaa-ef/core/target/surefire-reports/TEST-org.fudaa.dodico.ef.operation.refine.TestEfOperationRefine.xml
trunk/business/fudaa-ef/core/target/surefire-reports/TEST-org.fudaa.dodico.ef.operation.renum.TestEfOperationShufle.xml
trunk/business/fudaa-ef/core/target/surefire-reports/org.fudaa.dodico.ef.TestJLineIntersection.txt
trunk/business/fudaa-ef/core/target/surefire-reports/org.fudaa.dodico.ef.TestJSearchInGrid.txt
trunk/business/fudaa-ef/core/target/surefire-reports/org.fudaa.dodico.ef.TestJSearchIso.txt
trunk/business/fudaa-ef/core/target/surefire-reports/org.fudaa.dodico.ef.decorator.TestEfSwapListManager.txt
trunk/business/fudaa-ef/core/target/surefire-reports/org.fudaa.dodico.ef.operation.overstressed.TestEfFindEdgeToSwap.txt
trunk/business/fudaa-ef/core/target/surefire-reports/org.fudaa.dodico.ef.operation.overstressed.TestEfOperationOverstressed.txt
trunk/business/fudaa-ef/core/target/surefire-reports/org.fudaa.dodico.ef.operation.overstressed.TestEfOperationSwapSelectedEdge.txt
trunk/business/fudaa-ef/core/target/surefire-reports/org.fudaa.dodico.ef.operation.refine.TestEfOperationRefine.txt
trunk/business/fudaa-ef/core/target/surefire-reports/org.fudaa.dodico.ef.operation.renum.TestEfOperationShufle.txt
trunk/business/fudaa-ef/core/target/test-classes/
trunk/business/fudaa-ef/core/target/test-classes/org/
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/EfTestFactory.class
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/TestJLineIntersection$DefaultTester.class
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/TestJLineIntersection.class
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/TestJSearchInGrid.class
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/TestJSearchIso$DataAdapter.class
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/TestJSearchIso.class
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/decorator/
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/decorator/TestEfSwapListManager.class
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/operation/
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/operation/overstressed/
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/operation/overstressed/TestEfFindEdgeToSwap.class
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/operation/overstressed/TestEfOperationOverstressed.class
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/operation/overstressed/TestEfOperationSwapSelectedEdge.class
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/operation/refine/
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/operation/refine/TestEfOperationRefine.class
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/operation/renum/
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/operation/renum/TestEfOperationShufle$CircularIntBuffer$Element.class
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/operation/renum/TestEfOperationShufle$CircularIntBuffer.class
trunk/business/fudaa-ef/core/target/test-classes/org/fudaa/dodico/ef/operation/renum/TestEfOperationShufle.class
trunk/business/fudaa-ef/target/
trunk/business/fudaa-ef/target/mvn-eclipse-cache.properties
Added: trunk/business/fudaa-ef/.project
===================================================================
--- trunk/business/fudaa-ef/.project (rev 0)
+++ trunk/business/fudaa-ef/.project 2009-10-15 14:00:07 UTC (rev 5277)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>all-fudaa-ef</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Added: trunk/business/fudaa-ef/core/.classpath
===================================================================
--- trunk/business/fudaa-ef/core/.classpath (rev 0)
+++ trunk/business/fudaa-ef/core/.classpath 2009-10-15 14:00:07 UTC (rev 5277)
@@ -0,0 +1,25 @@
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/fudaa/framework/ctulu/ctulu-gis/1.1-SNAPSHOT/ctulu-gis-1.1-SNAPSHOT.jar" sourcepath="M2_REPO/org/fudaa/framework/ctulu/ctulu-gis/1.1-SNAPSHOT/ctulu-gis-1.1-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/fudaa/framework/ctulu/ctulu-common/1.1-SNAPSHOT/ctulu-common-1.1-SNAPSHOT.jar" sourcepath="M2_REPO/org/fudaa/framework/ctulu/ctulu-common/1.1-SNAPSHOT/ctulu-common-1.1-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/fudaa/framework/ctulu/ctulu-bu/1.1-SNAPSHOT/ctulu-bu-1.1-SNAPSHOT.jar" sourcepath="M2_REPO/org/fudaa/framework/ctulu/ctulu-bu/1.1-SNAPSHOT/ctulu-bu-1.1-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/fudaa/framework/ctulu/ctulu-fu/1.1-SNAPSHOT/ctulu-fu-1.1-SNAPSHOT.jar" sourcepath="M2_REPO/org/fudaa/framework/ctulu/ctulu-fu/1.1-SNAPSHOT/ctulu-fu-1.1-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jep/jep/2.4.0/jep-2.4.0.jar" sourcepath="M2_REPO/jep/jep/2.4.0/jep-2.4.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/trove/trove/2.0.4/trove-2.0.4.jar" sourcepath="M2_REPO/trove/trove/2.0.4/trove-2.0.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sourceforge/jexcelapi/jxl/2.6.3/jxl-2.6.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/log4j-over-slf4j/1.5.8/log4j-over-slf4j-1.5.8.jar" sourcepath="M2_REPO/org/slf4j/log4j-over-slf4j/1.5.8/log4j-over-slf4j-1.5.8-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/PDFRenderer/PDFRenderer/1.0/PDFRenderer-1.0.jar" sourcepath="M2_REPO/PDFRenderer/PDFRenderer/1.0/PDFRenderer-1.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/lowagie/itext/2.1.7/itext-2.1.7.jar" sourcepath="M2_REPO/com/lowagie/itext/2.1.7/itext-2.1.7-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/measure/jsr-275/0.9.1/jsr-275-0.9.1.jar" sourcepath="M2_REPO/javax/measure/jsr-275/0.9.1/jsr-275-0.9.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/db4o/db4o-java5/5.5/db4o-java5-5.5.jar" sourcepath="M2_REPO/com/db4o/db4o-java5/5.5/db4o-java5-5.5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/fgis/fgis/2.2.1/fgis-2.2.1.jar" sourcepath="M2_REPO/fgis/fgis/2.2.1/fgis-2.2.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/media/jai-core/1.1.3/jai-core-1.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/media/jai-codec/1.1.3/jai-codec-1.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/fudaa/framework/dodico/dodico-common/1.1-SNAPSHOT/dodico-common-1.1-SNAPSHOT.jar" sourcepath="M2_REPO/org/fudaa/framework/dodico/dodico-common/1.1-SNAPSHOT/dodico-common-1.1-SNAPSHOT-sources.jar"/>
+</classpath>
\ No newline at end of file
Added: trunk/business/fudaa-ef/core/.project
===================================================================
--- trunk/business/fudaa-ef/core/.project (rev 0)
+++ trunk/business/fudaa-ef/core/.project 2009-10-15 14:00:07 UTC (rev 5277)
@@ -0,0 +1,13 @@
+<projectDescription>
+ <name>core</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified: trunk/business/fudaa-ef/core/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/business/fudaa-ef/core/.settings/org.eclipse.jdt.core.prefs 2009-10-15 04:13:30 UTC (rev 5276)
+++ trunk/business/fudaa-ef/core/.settings/o...
[truncated message content] |
|
From: <de...@us...> - 2009-10-15 18:56:42
|
Revision: 5293
http://fudaa.svn.sourceforge.net/fudaa/?rev=5293&view=rev
Author: deniger
Date: 2009-10-15 18:56:34 +0000 (Thu, 15 Oct 2009)
Log Message:
-----------
Removed Paths:
-------------
trunk/business/fudaa-ef/.project
trunk/business/fudaa-ef/target/
Property Changed:
----------------
trunk/business/fudaa-ef/
Property changes on: trunk/business/fudaa-ef
___________________________________________________________________
Modified: svn:ignore
- target
.project
+ .project
target
Deleted: trunk/business/fudaa-ef/.project
===================================================================
--- trunk/business/fudaa-ef/.project 2009-10-15 18:53:16 UTC (rev 5292)
+++ trunk/business/fudaa-ef/.project 2009-10-15 18:56:34 UTC (rev 5293)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>all-fudaa-ef</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-17 07:37:31
|
Revision: 5354
http://fudaa.svn.sourceforge.net/fudaa/?rev=5354&view=rev
Author: deniger
Date: 2009-10-17 07:37:23 +0000 (Sat, 17 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2009-10-17 07:34:13 UTC (rev 5353)
+++ trunk/business/fudaa-ef/core/pom.xml 2009-10-17 07:37:23 UTC (rev 5354)
@@ -1,29 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.fudaa.business.ef</groupId>
- <artifactId>fudaa-ef</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <groupId>org.fudaa.business.ef</groupId>
- <artifactId>ef-core</artifactId>
- <name>EF Core</name>
- <dependencies>
- <dependency>
- <groupId>${ctuluGroupId}</groupId>
- <artifactId>ctulu-gis</artifactId>
- </dependency>
- <dependency>
- <groupId>${dodicoGroupId}</groupId>
- <artifactId>dodico-common</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.fudaa.business.ef</groupId>
+ <artifactId>fudaa-ef</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.fudaa.business.ef</groupId>
+ <artifactId>ef-core</artifactId>
+ <name>EF Core</name>
+ <dependencies>
+ <dependency>
+ <groupId>${ctuluGroupId}</groupId>
+ <artifactId>ctulu-gis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${dodicoGroupId}</groupId>
+ <artifactId>dodico-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2009-10-17 07:34:13 UTC (rev 5353)
+++ trunk/business/fudaa-ef/io/pom.xml 2009-10-17 07:37:23 UTC (rev 5354)
@@ -1,25 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.fudaa.business.ef</groupId>
- <artifactId>fudaa-ef</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <groupId>org.fudaa.business.ef</groupId>
- <artifactId>ef-io</artifactId>
- <name>EF Input/Output</name>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.ef</groupId>
- <artifactId>ef-core</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.fudaa.business.ef</groupId>
+ <artifactId>fudaa-ef</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.fudaa.business.ef</groupId>
+ <artifactId>ef-io</artifactId>
+ <name>EF Input/Output</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.ef</groupId>
+ <artifactId>ef-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2009-10-17 07:34:13 UTC (rev 5353)
+++ trunk/business/fudaa-ef/pom.xml 2009-10-17 07:37:23 UTC (rev 5354)
@@ -1,61 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <properties>
- <fudaa-framework.version>1.0</fudaa-framework.version>
- </properties>
-
- <parent>
- <groupId>org.fudaa.pom</groupId>
- <artifactId>business-pom</artifactId>
- <version>0.4</version>
- </parent>
- <groupId>org.fudaa.business.ef</groupId>
- <artifactId>fudaa-ef</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Fudaa-Ef Elements finis</name>
- <packaging>pom</packaging>
- <modules>
- <module>io</module>
- <module>core</module>
- <!--
- <module>client</module> a decommenter des que dependences résolues
- -->
- </modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-framework</artifactId>
- <version>${fudaa-framework.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.ef</groupId>
- <artifactId>ef-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.ef</groupId>
- <artifactId>ef-core</artifactId>
- <version>${version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.ef</groupId>
- <artifactId>ef-io</artifactId>
- <version>${version}</version>
- </dependency>
- <!-- <dependency>-->
- <!-- <groupId>org.fudaa.business.ef</groupId>-->
- <!-- <artifactId>client</artifactId>-->
- <!-- <version>${version}</version>-->
- <!-- </dependency>-->
- </dependencies>
- </dependencyManagement>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <properties>
+ <fudaa-framework.version>1.0</fudaa-framework.version>
+ </properties>
+
+ <parent>
+ <groupId>org.fudaa.pom</groupId>
+ <artifactId>business-pom</artifactId>
+ <version>0.4</version>
+ </parent>
+ <groupId>org.fudaa.business.ef</groupId>
+ <artifactId>fudaa-ef</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Fudaa-Ef Elements finis</name>
+ <packaging>pom</packaging>
+ <modules>
+ <module>io</module>
+ <module>core</module>
+ <!--
+ <module>client</module> a decommenter des que dependences résolues
+ -->
+ </modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.framework</groupId>
+ <artifactId>fudaa-framework</artifactId>
+ <version>${fudaa-framework.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.ef</groupId>
+ <artifactId>ef-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.ef</groupId>
+ <artifactId>ef-core</artifactId>
+ <version>${version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.ef</groupId>
+ <artifactId>ef-io</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <!-- <dependency>-->
+ <!-- <groupId>org.fudaa.business.ef</groupId>-->
+ <!-- <artifactId>client</artifactId>-->
+ <!-- <version>${version}</version>-->
+ <!-- </dependency>-->
+ </dependencies>
+ </dependencyManagement>
+
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-17 12:05:29
|
Revision: 5358
http://fudaa.svn.sourceforge.net/fudaa/?rev=5358&view=rev
Author: deniger
Date: 2009-10-17 12:05:22 +0000 (Sat, 17 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare release fudaa-ef-1.0
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2009-10-17 12:01:12 UTC (rev 5357)
+++ trunk/business/fudaa-ef/core/pom.xml 2009-10-17 12:05:22 UTC (rev 5358)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>ef-core</artifactId>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2009-10-17 12:01:12 UTC (rev 5357)
+++ trunk/business/fudaa-ef/io/pom.xml 2009-10-17 12:05:22 UTC (rev 5358)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>ef-io</artifactId>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2009-10-17 12:01:12 UTC (rev 5357)
+++ trunk/business/fudaa-ef/pom.xml 2009-10-17 12:05:22 UTC (rev 5358)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
<modules>
@@ -57,4 +57,10 @@
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.0</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.0</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/fudaa-ef-1.0</url>
+ </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-17 12:06:08
|
Revision: 5360
http://fudaa.svn.sourceforge.net/fudaa/?rev=5360&view=rev
Author: deniger
Date: 2009-10-17 12:05:57 +0000 (Sat, 17 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2009-10-17 12:05:43 UTC (rev 5359)
+++ trunk/business/fudaa-ef/core/pom.xml 2009-10-17 12:05:57 UTC (rev 5360)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>ef-core</artifactId>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2009-10-17 12:05:43 UTC (rev 5359)
+++ trunk/business/fudaa-ef/io/pom.xml 2009-10-17 12:05:57 UTC (rev 5360)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>ef-io</artifactId>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2009-10-17 12:05:43 UTC (rev 5359)
+++ trunk/business/fudaa-ef/pom.xml 2009-10-17 12:05:57 UTC (rev 5360)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
<modules>
@@ -56,11 +56,4 @@
<!-- </dependency>-->
</dependencies>
</dependencyManagement>
-
-
- <scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.0</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.0</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/fudaa-ef-1.0</url>
- </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-17 12:30:24
|
Revision: 5363
http://fudaa.svn.sourceforge.net/fudaa/?rev=5363&view=rev
Author: deniger
Date: 2009-10-17 12:30:13 +0000 (Sat, 17 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2009-10-17 12:29:12 UTC (rev 5362)
+++ trunk/business/fudaa-ef/core/pom.xml 2009-10-17 12:30:13 UTC (rev 5363)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>ef-core</artifactId>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2009-10-17 12:29:12 UTC (rev 5362)
+++ trunk/business/fudaa-ef/io/pom.xml 2009-10-17 12:30:13 UTC (rev 5363)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>ef-io</artifactId>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2009-10-17 12:29:12 UTC (rev 5362)
+++ trunk/business/fudaa-ef/pom.xml 2009-10-17 12:30:13 UTC (rev 5363)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
<modules>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-17 12:35:33
|
Revision: 5366
http://fudaa.svn.sourceforge.net/fudaa/?rev=5366&view=rev
Author: deniger
Date: 2009-10-17 12:35:25 +0000 (Sat, 17 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare release fudaa-ef-1.0
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2009-10-17 12:32:49 UTC (rev 5365)
+++ trunk/business/fudaa-ef/core/pom.xml 2009-10-17 12:35:25 UTC (rev 5366)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>ef-core</artifactId>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2009-10-17 12:32:49 UTC (rev 5365)
+++ trunk/business/fudaa-ef/io/pom.xml 2009-10-17 12:35:25 UTC (rev 5366)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>ef-io</artifactId>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2009-10-17 12:32:49 UTC (rev 5365)
+++ trunk/business/fudaa-ef/pom.xml 2009-10-17 12:35:25 UTC (rev 5366)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
<modules>
@@ -56,4 +56,10 @@
<!-- </dependency>-->
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.0</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.0</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/fudaa-ef-1.0</url>
+ </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-17 12:36:21
|
Revision: 5368
http://fudaa.svn.sourceforge.net/fudaa/?rev=5368&view=rev
Author: deniger
Date: 2009-10-17 12:36:09 +0000 (Sat, 17 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2009-10-17 12:35:45 UTC (rev 5367)
+++ trunk/business/fudaa-ef/core/pom.xml 2009-10-17 12:36:09 UTC (rev 5368)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>ef-core</artifactId>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2009-10-17 12:35:45 UTC (rev 5367)
+++ trunk/business/fudaa-ef/io/pom.xml 2009-10-17 12:36:09 UTC (rev 5368)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>ef-io</artifactId>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2009-10-17 12:35:45 UTC (rev 5367)
+++ trunk/business/fudaa-ef/pom.xml 2009-10-17 12:36:09 UTC (rev 5368)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
<modules>
@@ -56,10 +56,4 @@
<!-- </dependency>-->
</dependencies>
</dependencyManagement>
-
- <scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.0</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.0</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/fudaa-ef-1.0</url>
- </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-17 13:02:32
|
Revision: 5371
http://fudaa.svn.sourceforge.net/fudaa/?rev=5371&view=rev
Author: deniger
Date: 2009-10-17 13:02:25 +0000 (Sat, 17 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2009-10-17 13:00:58 UTC (rev 5370)
+++ trunk/business/fudaa-ef/core/pom.xml 2009-10-17 13:02:25 UTC (rev 5371)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>ef-core</artifactId>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2009-10-17 13:00:58 UTC (rev 5370)
+++ trunk/business/fudaa-ef/pom.xml 2009-10-17 13:02:25 UTC (rev 5371)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
<modules>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-17 13:05:26
|
Revision: 5374
http://fudaa.svn.sourceforge.net/fudaa/?rev=5374&view=rev
Author: deniger
Date: 2009-10-17 13:05:20 +0000 (Sat, 17 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare release fudaa-ef-1.0
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2009-10-17 13:03:39 UTC (rev 5373)
+++ trunk/business/fudaa-ef/core/pom.xml 2009-10-17 13:05:20 UTC (rev 5374)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>ef-core</artifactId>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2009-10-17 13:03:39 UTC (rev 5373)
+++ trunk/business/fudaa-ef/io/pom.xml 2009-10-17 13:05:20 UTC (rev 5374)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>ef-io</artifactId>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2009-10-17 13:03:39 UTC (rev 5373)
+++ trunk/business/fudaa-ef/pom.xml 2009-10-17 13:05:20 UTC (rev 5374)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
<modules>
@@ -56,4 +56,10 @@
<!-- </dependency>-->
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.0</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.0</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/fudaa-ef-1.0</url>
+ </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-17 13:06:02
|
Revision: 5376
http://fudaa.svn.sourceforge.net/fudaa/?rev=5376&view=rev
Author: deniger
Date: 2009-10-17 13:05:54 +0000 (Sat, 17 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2009-10-17 13:05:40 UTC (rev 5375)
+++ trunk/business/fudaa-ef/core/pom.xml 2009-10-17 13:05:54 UTC (rev 5376)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>ef-core</artifactId>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2009-10-17 13:05:40 UTC (rev 5375)
+++ trunk/business/fudaa-ef/io/pom.xml 2009-10-17 13:05:54 UTC (rev 5376)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>ef-io</artifactId>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2009-10-17 13:05:40 UTC (rev 5375)
+++ trunk/business/fudaa-ef/pom.xml 2009-10-17 13:05:54 UTC (rev 5376)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
<modules>
@@ -56,10 +56,4 @@
<!-- </dependency>-->
</dependencies>
</dependencyManagement>
-
- <scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.0</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.0</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/fudaa-ef-1.0</url>
- </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-18 18:21:54
|
Revision: 5385
http://fudaa.svn.sourceforge.net/fudaa/?rev=5385&view=rev
Author: deniger
Date: 2009-10-18 18:21:46 +0000 (Sun, 18 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare release fudaa-ef-1.1
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2009-10-18 17:18:37 UTC (rev 5384)
+++ trunk/business/fudaa-ef/core/pom.xml 2009-10-18 18:21:46 UTC (rev 5385)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-core</artifactId>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2009-10-18 17:18:37 UTC (rev 5384)
+++ trunk/business/fudaa-ef/io/pom.xml 2009-10-18 18:21:46 UTC (rev 5385)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-io</artifactId>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2009-10-18 17:18:37 UTC (rev 5384)
+++ trunk/business/fudaa-ef/pom.xml 2009-10-18 18:21:46 UTC (rev 5385)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
<modules>
@@ -56,4 +56,10 @@
<!-- </dependency>-->
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.1</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.1</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/fudaa-ef-1.1</url>
+ </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-18 18:24:57
|
Revision: 5387
http://fudaa.svn.sourceforge.net/fudaa/?rev=5387&view=rev
Author: deniger
Date: 2009-10-18 18:24:49 +0000 (Sun, 18 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2009-10-18 18:23:02 UTC (rev 5386)
+++ trunk/business/fudaa-ef/core/pom.xml 2009-10-18 18:24:49 UTC (rev 5387)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-core</artifactId>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2009-10-18 18:23:02 UTC (rev 5386)
+++ trunk/business/fudaa-ef/io/pom.xml 2009-10-18 18:24:49 UTC (rev 5387)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-io</artifactId>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2009-10-18 18:23:02 UTC (rev 5386)
+++ trunk/business/fudaa-ef/pom.xml 2009-10-18 18:24:49 UTC (rev 5387)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
<modules>
@@ -56,10 +56,4 @@
<!-- </dependency>-->
</dependencies>
</dependencyManagement>
-
- <scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.1</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.1</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/fudaa-ef-1.1</url>
- </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-18 18:42:21
|
Revision: 5389
http://fudaa.svn.sourceforge.net/fudaa/?rev=5389&view=rev
Author: deniger
Date: 2009-10-18 18:42:15 +0000 (Sun, 18 Oct 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2009-10-18 18:39:21 UTC (rev 5388)
+++ trunk/business/fudaa-ef/core/pom.xml 2009-10-18 18:42:15 UTC (rev 5389)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-core</artifactId>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2009-10-18 18:39:21 UTC (rev 5388)
+++ trunk/business/fudaa-ef/io/pom.xml 2009-10-18 18:42:15 UTC (rev 5389)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-io</artifactId>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2009-10-18 18:39:21 UTC (rev 5388)
+++ trunk/business/fudaa-ef/pom.xml 2009-10-18 18:42:15 UTC (rev 5389)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
<modules>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-18 18:45:01
|
Revision: 5391
http://fudaa.svn.sourceforge.net/fudaa/?rev=5391&view=rev
Author: deniger
Date: 2009-10-18 18:44:54 +0000 (Sun, 18 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare release fudaa-ef-1.0
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2009-10-18 18:43:15 UTC (rev 5390)
+++ trunk/business/fudaa-ef/core/pom.xml 2009-10-18 18:44:54 UTC (rev 5391)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-core</artifactId>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2009-10-18 18:43:15 UTC (rev 5390)
+++ trunk/business/fudaa-ef/io/pom.xml 2009-10-18 18:44:54 UTC (rev 5391)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-io</artifactId>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2009-10-18 18:43:15 UTC (rev 5390)
+++ trunk/business/fudaa-ef/pom.xml 2009-10-18 18:44:54 UTC (rev 5391)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
<modules>
@@ -56,4 +56,10 @@
<!-- </dependency>-->
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.0</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.0</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/fudaa-ef-1.0</url>
+ </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-10-18 18:45:51
|
Revision: 5393
http://fudaa.svn.sourceforge.net/fudaa/?rev=5393&view=rev
Author: deniger
Date: 2009-10-18 18:45:37 +0000 (Sun, 18 Oct 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2009-10-18 18:45:15 UTC (rev 5392)
+++ trunk/business/fudaa-ef/core/pom.xml 2009-10-18 18:45:37 UTC (rev 5393)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-core</artifactId>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2009-10-18 18:45:15 UTC (rev 5392)
+++ trunk/business/fudaa-ef/io/pom.xml 2009-10-18 18:45:37 UTC (rev 5393)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-io</artifactId>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2009-10-18 18:45:15 UTC (rev 5392)
+++ trunk/business/fudaa-ef/pom.xml 2009-10-18 18:45:37 UTC (rev 5393)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
<modules>
@@ -56,10 +56,4 @@
<!-- </dependency>-->
</dependencies>
</dependencyManagement>
-
- <scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.0</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.0</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/fudaa-ef-1.0</url>
- </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-11-03 16:33:14
|
Revision: 5465
http://fudaa.svn.sourceforge.net/fudaa/?rev=5465&view=rev
Author: chrisc83
Date: 2009-11-03 16:32:58 +0000 (Tue, 03 Nov 2009)
Log Message:
-----------
OPEN - issue PREPRO-54: G?\195?\169rer les fichiers SuperTab
http://www.fudaa.fr/jira/browse/PREPRO-54
Modified Paths:
--------------
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridDefaultAbstract.java
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/supertab/SuperTabReader.java
trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/supertab/TestSuperTabReader.java
Added Paths:
-----------
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/GridReadResult.java
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridDefaultAbstract.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridDefaultAbstract.java 2009-11-02 17:09:14 UTC (rev 5464)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridDefaultAbstract.java 2009-11-03 16:32:58 UTC (rev 5465)
@@ -1134,11 +1134,11 @@
* @return les elements surcontraints ou null si aucun
*/
public final int[] getOverstressedElement(final ProgressionInterface _progress) {
- final EfElementType t = getEltType();
- if ((t != EfElementType.T3) && (t != EfElementType.T6)) {
- FuLog.error("Only for triangles");
- return null;
- }
+// final EfElementType t = getEltType();
+// if ((t != EfElementType.T3) && (t != EfElementType.T6)) {
+// FuLog.error("Only for triangles");
+// return null;
+// }
final int nbElt = getEltNb();
final TIntArrayList r = new TIntArrayList(nbElt);
// Mise en place de la progression
@@ -1151,22 +1151,30 @@
}
fr = getFrontiers();
if (fr == null) { return null; }
- final boolean t6 = (t == EfElementType.T6);
- if (t6) {
+// final boolean t6 = (t == EfElementType.T6);
+// if (t6) {
+// for (int i = nbElt - 1; i >= 0; i--) {
+// if (getElement(i).isOverstressedT6(fr)) {
+// r.add(i);
+// }
+// prog.majAvancement();
+// }
+// } else {
for (int i = nbElt - 1; i >= 0; i--) {
- if (getElement(i).isOverstressedT6(fr)) {
- r.add(i);
- }
- prog.majAvancement();
+ if(getElement(i).getDefaultType()==EfElementType.T6){
+ if (getElement(i).isOverstressedT6(fr)) {
+ r.add(i);
+ }
+ }
+ else
+ {
+ if (getElement(i).isOverstressed(fr)) {
+ r.add(i);
+ }
+ }
+ prog.majAvancement();
}
- } else {
- for (int i = nbElt - 1; i >= 0; i--) {
- if (getElement(i).isOverstressed(fr)) {
- r.add(i);
- }
- prog.majAvancement();
- }
- }
+// }
return r.isEmpty() ? null : r.toNativeArray();
}
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2009-11-02 17:09:14 UTC (rev 5464)
+++ trunk/business/fudaa-ef/io/pom.xml 2009-11-03 16:32:58 UTC (rev 5465)
@@ -19,6 +19,7 @@
<groupId>org.fudaa.framework.dodico</groupId>
<artifactId>dodico-common</artifactId>
<type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Added: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/GridReadResult.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/GridReadResult.java (rev 0)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/GridReadResult.java 2009-11-03 16:32:58 UTC (rev 5465)
@@ -0,0 +1,53 @@
+package org.fudaa.dodico.ef.io;
+
+import org.fudaa.dodico.ef.impl.EfGridSourceDefaut;
+
+public class GridReadResult
+{
+ EfGridSourceDefaut gridSrc;
+ int[] boundaryConditions;
+ String title;
+
+ public GridReadResult()
+ {
+ this(null, null, null);
+ }
+
+ public GridReadResult(EfGridSourceDefaut grid, int[] boundaryConditions, String title)
+ {
+ super();
+ this.gridSrc = grid;
+ this.boundaryConditions = boundaryConditions;
+ this.title = title;
+ }
+
+ public EfGridSourceDefaut getGridSrc()
+ {
+ return gridSrc;
+ }
+
+ public void setGridSrc(EfGridSourceDefaut gridSrc)
+ {
+ this.gridSrc = gridSrc;
+ }
+
+ public int[] getBoundaryConditions()
+ {
+ return boundaryConditions;
+ }
+
+ public void setBoundaryConditions(int[] boundaryConditions)
+ {
+ this.boundaryConditions = boundaryConditions;
+ }
+
+ public String getTitle()
+ {
+ return title;
+ }
+
+ public void setTitle(String title)
+ {
+ this.title = title;
+ }
+}
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/supertab/SuperTabReader.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/supertab/SuperTabReader.java 2009-11-02 17:09:14 UTC (rev 5464)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/supertab/SuperTabReader.java 2009-11-03 16:32:58 UTC (rev 5465)
@@ -1,43 +1,46 @@
package org.fudaa.dodico.ef.io.supertab;
+import gnu.trove.TIntArrayList;
+
import java.io.EOFException;
import java.io.IOException;
import java.util.ArrayList;
import org.fudaa.dodico.ef.EfElement;
import org.fudaa.dodico.ef.EfElementType;
-import org.fudaa.dodico.ef.EfGridSource;
import org.fudaa.dodico.ef.EfNode;
import org.fudaa.dodico.ef.impl.EfGridMutable;
import org.fudaa.dodico.ef.impl.EfGridSourceDefaut;
+import org.fudaa.dodico.ef.io.GridReadResult;
import org.fudaa.dodico.fortran.FileOpReadCharSimpleAbstract;
public class SuperTabReader extends FileOpReadCharSimpleAbstract
{
+/*
public enum SuperTabFormat
{
SUPERTAB_V4,
SUPERTAB_V6,
}
-
-// private final static int TITLE_SEC = 151;
+*/
+ private final static int TITLE_SEC = 151;
private final static int NODES_SIMPLE_PREC_SEC = 15;
private final static int NODES_DOUBLE_PREC_SEC_V4 = 0;
private final static int NODES_DOUBLE_PREC_SEC_V6 = 781;
private final static int ELEMENTS_SEC_V4 = 71;
private final static int ELEMENTS_SEC_V6 = 780;
-
+/*
private SuperTabFormat format;
-// private int titleSec;
+ private int titleSec;
private int nodesSimplePrecSec;
private int nodesDoublePrecSec;
private int elementsSec;
-
+*/
public SuperTabReader()
{
- this(SuperTabFormat.SUPERTAB_V6);
+// this(SuperTabFormat.SUPERTAB_V6);
}
-
+/*
public SuperTabReader(SuperTabFormat format)
{
this.setFormat(format);
@@ -73,60 +76,69 @@
}
}
}
-
+*/
@Override
protected Object internalRead()
{
return readGrid();
}
- private EfGridSource readGrid()
+ private GridReadResult readGrid()
{
//TODO Voir si les initialisations sont correctes.
in_.setJumpBlankLine(true);
in_.setCommentInOneField("!");
in_.setJumpCommentLine(true);
-// String title;
+ String title = "";
ArrayList<EfNode> nodes = new ArrayList<EfNode>();
+ TIntArrayList boundaryCond = new TIntArrayList();
ArrayList<EfElement> elements = new ArrayList<EfElement>();
boolean titleRead = false;
boolean nodesRead = false;
boolean elementsRead = false;
EfElementType type = null;
int sector;
- boolean isIntField;
try
{
while (!(titleRead && nodesRead && elementsRead))
{
- isIntField = false;
- sector = 0;
+ this.searchBeginSector();
- // Recherche la prochaine ligne commen\xE7ant par -1 (ligne avant celle contenant le n\xB0 de secteur).
- while (!(isIntField && (sector == -1)))
+ sector = this.searchNextSector();
+
+ switch (sector)
{
- in_.readFields();
+ case TITLE_SEC :
+ {
+ title = this.readTitle();
+
+ titleRead = true;
- try
+ break;
+ }
+ case NODES_SIMPLE_PREC_SEC :
+ case NODES_DOUBLE_PREC_SEC_V4 :
+ case NODES_DOUBLE_PREC_SEC_V6 :
{
- sector = Integer.parseInt(in_.stringField(0));
+ this.readNodes(nodes, boundaryCond);
- isIntField = true;
+ nodesRead = true;
+
+ break;
}
- catch (Exception e)
+ case ELEMENTS_SEC_V4 :
+ case ELEMENTS_SEC_V6 :
{
+ type = this.readElements(elements);
+
+ elementsRead = true;
+
+ break;
}
}
- // Recherche du prochain n\xB0 de secteur.
- while (sector == -1)
- {
- in_.readFields();
-
- sector = in_.intField(0);
- }
/*
if (sector == this.titleSec)
{
@@ -134,7 +146,7 @@
titleRead = true;
}
- else*/ if ((sector == this.nodesSimplePrecSec) || (sector == this.nodesDoublePrecSec))
+ else*//* if ((sector == this.nodesSimplePrecSec) || (sector == this.nodesDoublePrecSec))
{
this.readNodes(nodes);
@@ -145,7 +157,7 @@
type = this.readElements(elements);
elementsRead = true;
- }
+ }*/
}
}
catch (final EOFException eOFException)
@@ -168,13 +180,59 @@
grid.setTypeElt(type);
// EfLib.orienteGrid(grid, progress_, true, analyze_);
- return new EfGridSourceDefaut(grid, SuperTabFileFormat.getInstance());
+ return new GridReadResult(new EfGridSourceDefaut(grid, SuperTabFileFormat.getInstance()), boundaryCond.toNativeArray(), title);
}
return null;
}
/**
+ * Recherche le num\xE9ro du prochain secteur.
+ * @return le num\xE9ro du prochain secteur.
+ * @throws IOException
+ */
+ private int searchNextSector() throws IOException
+ {
+ int sector = -1;
+
+ // Recherche du prochain n\xB0 de secteur.
+ while (sector == -1)
+ {
+ in_.readFields();
+
+ sector = in_.intField(0);
+ }
+
+ return sector;
+ }
+
+ /**
+ * Recherche le d\xE9but du prochain secteur.
+ * @throws IOException
+ */
+ private void searchBeginSector() throws IOException
+ {
+ int sector = 0;
+ boolean isIntField = false;
+
+ // Recherche la prochaine ligne commen\xE7ant par -1 (ligne avant celle contenant le n\xB0 de secteur).
+ while (!(isIntField && (sector == -1)))
+ {
+ in_.readFields();
+
+ try
+ {
+ sector = Integer.parseInt(in_.stringField(0));
+
+ isIntField = true;
+ }
+ catch (Exception e)
+ {
+ }
+ }
+ }
+
+ /**
* Donne le type d'\xE9l\xE9ments pour la grille.
* @param currentType le type trouv\xE9 actuellement.
* @param nbPts le nombre de points de l'\xE9l\xE9ment test\xE9.
@@ -252,22 +310,23 @@
/**
* Lit les points dans le fichier.
* @param nodes la liste des points.
+ * @param boundaryCondtion la liste des conditions limites.
* @throws IOException
*/
- private void readNodes(ArrayList<EfNode> nodes) throws IOException
+ private void readNodes(ArrayList<EfNode> nodes, TIntArrayList boundaryCondtion) throws IOException
{
in_.readFields();
int sector = in_.intField(0);
while (sector != -1)
{
- //TODO Que faire de color?
-// int color = in_.intField(3);
+ int color = in_.intField(3);
double x = in_.doubleField(4);
double y = in_.doubleField(5);
double z = in_.doubleField(6);
nodes.add(new EfNode(x, y, z));
+ boundaryCondtion.add(color);
in_.readFields();
sector = in_.intField(0);
@@ -279,10 +338,10 @@
* @return le titre du fichier.
* @throws IOException
*/
-/* private String readTitle() throws IOException
+ private String readTitle() throws IOException
{
in_.readFields();
return in_.stringField(0);
- }*/
-}
+ }
+}
\ No newline at end of file
Modified: trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/supertab/TestSuperTabReader.java
===================================================================
--- trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/supertab/TestSuperTabReader.java 2009-11-02 17:09:14 UTC (rev 5464)
+++ trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/supertab/TestSuperTabReader.java 2009-11-03 16:32:58 UTC (rev 5465)
@@ -1,14 +1,15 @@
package org.fudaa.dodico.ef.io.supertab;
import java.io.File;
+import java.net.URI;
import junit.framework.TestCase;
import org.fudaa.ctulu.CtuluIOOperationSynthese;
import org.fudaa.dodico.ef.EfElement;
import org.fudaa.dodico.ef.EfGridInterface;
-import org.fudaa.dodico.ef.EfGridSource;
import org.fudaa.dodico.ef.EfNode;
+import org.fudaa.dodico.ef.io.GridReadResult;
public class TestSuperTabReader extends TestCase
@@ -18,25 +19,39 @@
public void testReader()
{
SuperTabReader reader = new SuperTabReader();
-
// reader.setFile(new File("C:\\test.unv"));
- reader.setFile(new File("src\\test\\resources\\org\\fudaa\\dodico\\ef\\io\\supertab\\sup6.unv"));
+ URI uri = null;
+ try
+ {
+ uri = this.getClass().getResource("sup6.unv").toURI();
+ }
+ catch(Exception e)
+ {
+ }
+
+ assertNotNull("L'URI du fichier est incorrect.", uri);
+
+ reader.setFile(new File(uri));
+
CtuluIOOperationSynthese synth = reader.read();
// Test que la lecture se soit execut\xE9e sans erreurs.
assertFalse(synth.getAnalyze().containsErrors());
+ assertFalse(synth.getAnalyze().containsFatalError());
- EfGridInterface grid = ((EfGridSource)synth.getSource()).getGrid();
+ GridReadResult result = (GridReadResult)synth.getSource();
+ EfGridInterface grid = result.getGridSrc().getGrid();
+ // Test que le titre est correct.
+ assertEquals("amphi", result.getTitle());
+
// Test que la grille poss\xE8de le bon nombre de points et d'\xE9l\xE9ments.
assertEquals(1029, grid.getPtsNb());
assertEquals(960 , grid.getEltNb());
- EfNode[] nodes = grid.getNodes();
- EfElement[] elements = grid.getElts();
- EfNode[] originalNodes = this.getOriginalNodes();
- EfElement[] originalElements = this.getOriginalElements();
+ EfNode[] nodes = grid.getNodes();
+ EfNode[] originalNodes = this.getOriginalNodes();
// Test que tout les points soyent corrects.
for (int i = 0; i < nodes.length; i++)
@@ -44,11 +59,26 @@
assertTrue(nodes[i].equalsExact(originalNodes[i], this.eps));
}
+ EfElement[] elements = grid.getElts();
+ EfElement[] originalElements = this.getOriginalElements();
+
// Test que tout les \xE9l\xE9ments soyent corrects.
for (int i = 0; i < elements.length; i++)
{
assertTrue(elements[i].isSameStrict(originalElements[i]));
}
+
+ int[] boundaryConditions = result.getBoundaryConditions();
+ int[] originalBoundaryConditions = this.getOriginalBoundaryConditions();
+
+ // Test que le resultat contient le bon nombre de conditions limites.
+ assertEquals(1029, boundaryConditions.length);
+
+ // Test que toute les conditions limites soyent corrects.
+ for (int i = 0; i < boundaryConditions.length; i++)
+ {
+ assertEquals(originalBoundaryConditions[i], boundaryConditions[i]);
+ }
}
/**
@@ -2063,4 +2093,1041 @@
return elements;
}
+
+ private int[] getOriginalBoundaryConditions()
+ {
+ int[] boundaryConditions = new int[1029];
+
+ boundaryConditions[0] = 12;
+ boundaryConditions[1] = 11;
+ boundaryConditions[2] = 11;
+ boundaryConditions[3] = 11;
+ boundaryConditions[4] = 11;
+ boundaryConditions[5] = 11;
+ boundaryConditions[6] = 11;
+ boundaryConditions[7] = 11;
+ boundaryConditions[8] = 11;
+ boundaryConditions[9] = 11;
+ boundaryConditions[10] = 11;
+ boundaryConditions[11] = 11;
+ boundaryConditions[12] = 11;
+ boundaryConditions[13] = 11;
+ boundaryConditions[14] = 11;
+ boundaryConditions[15] = 11;
+ boundaryConditions[16] = 11;
+ boundaryConditions[17] = 11;
+ boundaryConditions[18] = 11;
+ boundaryConditions[19] = 11;
+ boundaryConditions[20] = 11;
+ boundaryConditions[21] = 11;
+ boundaryConditions[22] = 11;
+ boundaryConditions[23] = 11;
+ boundaryConditions[24] = 11;
+ boundaryConditions[25] = 11;
+ boundaryConditions[26] = 11;
+ boundaryConditions[27] = 11;
+ boundaryConditions[28] = 11;
+ boundaryConditions[29] = 11;
+ boundaryConditions[30] = 11;
+ boundaryConditions[31] = 11;
+ boundaryConditions[32] = 11;
+ boundaryConditions[33] = 11;
+ boundaryConditions[34] = 11;
+ boundaryConditions[35] = 11;
+ boundaryConditions[36] = 11;
+ boundaryConditions[37] = 11;
+ boundaryConditions[38] = 11;
+ boundaryConditions[39] = 11;
+ boundaryConditions[40] = 11;
+ boundaryConditions[41] = 11;
+ boundaryConditions[42] = 11;
+ boundaryConditions[43] = 11;
+ boundaryConditions[44] = 11;
+ boundaryConditions[45] = 11;
+ boundaryConditions[46] = 11;
+ boundaryConditions[47] = 11;
+ boundaryConditions[48] = 12;
+ boundaryConditions[49] = 12;
+ boundaryConditions[50] = 11;
+ boundaryConditions[51] = 11;
+ boundaryConditions[52] = 11;
+ boundaryConditions[53] = 11;
+ boundaryConditions[54] = 11;
+ boundaryConditions[55] = 11;
+ boundaryConditions[56] = 11;
+ boundaryConditions[57] = 11;
+ boundaryConditions[58] = 11;
+ boundaryConditions[59] = 11;
+ boundaryConditions[60] = 11;
+ boundaryConditions[61] = 11;
+ boundaryConditions[62] = 11;
+ boundaryConditions[63] = 11;
+ boundaryConditions[64] = 11;
+ boundaryConditions[65] = 11;
+ boundaryConditions[66] = 11;
+ boundaryConditions[67] = 11;
+ boundaryConditions[68] = 11;
+ boundaryConditions[69] = 11;
+ boundaryConditions[70] = 11;
+ boundaryConditions[71] = 11;
+ boundaryConditions[72] = 11;
+ boundaryConditions[73] = 11;
+ boundaryConditions[74] = 11;
+ boundaryConditions[75] = 11;
+ boundaryConditions[76] = 11;
+ boundaryConditions[77] = 11;
+ boundaryConditions[78] = 11;
+ boundaryConditions[79] = 11;
+ boundaryConditions[80] = 11;
+ boundaryConditions[81] = 11;
+ boundaryConditions[82] = 11;
+ boundaryConditions[83] = 11;
+ boundaryConditions[84] = 11;
+ boundaryConditions[85] = 11;
+ boundaryConditions[86] = 11;
+ boundaryConditions[87] = 11;
+ boundaryConditions[88] = 11;
+ boundaryConditions[89] = 11;
+ boundaryConditions[90] = 11;
+ boundaryConditions[91] = 11;
+ boundaryConditions[92] = 11;
+ boundaryConditions[93] = 11;
+ boundaryConditions[94] = 11;
+ boundaryConditions[95] = 11;
+ boundaryConditions[96] = 11;
+ boundaryConditions[97] = 12;
+ boundaryConditions[98] = 12;
+ boundaryConditions[99] = 11;
+ boundaryConditions[100] = 11;
+ boundaryConditions[101] = 11;
+ boundaryConditions[102] = 11;
+ boundaryConditions[103] = 11;
+ boundaryConditions[104] = 11;
+ boundaryConditions[105] = 11;
+ boundaryConditions[106] = 11;
+ boundaryConditions[107] = 11;
+ boundaryConditions[108] = 11;
+ boundaryConditions[109] = 11;
+ boundaryConditions[110] = 11;
+ boundaryConditions[111] = 11;
+ boundaryConditions[112] = 11;
+ boundaryConditions[113] = 11;
+ boundaryConditions[114] = 11;
+ boundaryConditions[115] = 11;
+ boundaryConditions[116] = 11;
+ boundaryConditions[117] = 11;
+ boundaryConditions[118] = 11;
+ boundaryConditions[119] = 11;
+ boundaryConditions[120] = 11;
+ boundaryConditions[121] = 11;
+ boundaryConditions[122] = 11;
+ boundaryConditions[123] = 11;
+ boundaryConditions[124] = 11;
+ boundaryConditions[125] = 11;
+ boundaryConditions[126] = 11;
+ boundaryConditions[127] = 11;
+ boundaryConditions[128] = 11;
+ boundaryConditions[129] = 11;
+ boundaryConditions[130] = 11;
+ boundaryConditions[131] = 11;
+ boundaryConditions[132] = 11;
+ boundaryConditions[133] = 11;
+ boundaryConditions[134] = 11;
+ boundaryConditions[135] = 11;
+ boundaryConditions[136] = 11;
+ boundaryConditions[137] = 11;
+ boundaryConditions[138] = 11;
+ boundaryConditions[139] = 11;
+ boundaryConditions[140] = 11;
+ boundaryConditions[141] = 11;
+ boundaryConditions[142] = 11;
+ boundaryConditions[143] = 11;
+ boundaryConditions[144] = 11;
+ boundaryConditions[145] = 11;
+ boundaryConditions[146] = 12;
+ boundaryConditions[147] = 12;
+ boundaryConditions[148] = 11;
+ boundaryConditions[149] = 11;
+ boundaryConditions[150] = 11;
+ boundaryConditions[151] = 11;
+ boundaryConditions[152] = 11;
+ boundaryConditions[153] = 11;
+ boundaryConditions[154] = 11;
+ boundaryConditions[155] = 11;
+ boundaryConditions[156] = 11;
+ boundaryConditions[157] = 11;
+ boundaryConditions[158] = 11;
+ boundaryConditions[159] = 11;
+ boundaryConditions[160] = 11;
+ boundaryConditions[161] = 11;
+ boundaryConditions[162] = 11;
+ boundaryConditions[163] = 11;
+ boundaryConditions[164] = 11;
+ boundaryConditions[165] = 11;
+ boundaryConditions[166] = 11;
+ boundaryConditions[167] = 11;
+ boundaryConditions[168] = 11;
+ boundaryConditions[169] = 11;
+ boundaryConditions[170] = 11;
+ boundaryConditions[171] = 11;
+ boundaryConditions[172] = 11;
+ boundaryConditions[173] = 11;
+ boundaryConditions[174] = 11;
+ boundaryConditions[175] = 11;
+ boundaryConditions[176] = 11;
+ boundaryConditions[177] = 11;
+ boundaryConditions[178] = 11;
+ boundaryConditions[179] = 11;
+ boundaryConditions[180] = 11;
+ boundaryConditions[181] = 11;
+ boundaryConditions[182] = 11;
+ boundaryConditions[183] = 11;
+ boundaryConditions[184] = 11;
+ boundaryConditions[185] = 11;
+ boundaryConditions[186] = 11;
+ boundaryConditions[187] = 11;
+ boundaryConditions[188] = 11;
+ boundaryConditions[189] = 11;
+ boundaryConditions[190] = 11;
+ boundaryConditions[191] = 11;
+ boundaryConditions[192] = 11;
+ boundaryConditions[193] = 11;
+ boundaryConditions[194] = 11;
+ boundaryConditions[195] = 12;
+ boundaryConditions[196] = 12;
+ boundaryConditions[197] = 11;
+ boundaryConditions[198] = 11;
+ boundaryConditions[199] = 11;
+ boundaryConditions[200] = 11;
+ boundaryConditions[201] = 11;
+ boundaryConditions[202] = 11;
+ boundaryConditions[203] = 11;
+ boundaryConditions[204] = 11;
+ boundaryConditions[205] = 11;
+ boundaryConditions[206] = 11;
+ boundaryConditions[207] = 11;
+ boundaryConditions[208] = 11;
+ boundaryConditions[209] = 11;
+ boundaryConditions[210] = 11;
+ boundaryConditions[211] = 11;
+ boundaryConditions[212] = 11;
+ boundaryConditions[213] = 11;
+ boundaryConditions[214] = 11;
+ boundaryConditions[215] = 11;
+ boundaryConditions[216] = 11;
+ boundaryConditions[217] = 11;
+ boundaryConditions[218] = 11;
+ boundaryConditions[219] = 11;
+ boundaryConditions[220] = 11;
+ boundaryConditions[221] = 11;
+ boundaryConditions[222] = 11;
+ boundaryConditions[223] = 11;
+ boundaryConditions[224] = 11;
+ boundaryConditions[225] = 11;
+ boundaryConditions[226] = 11;
+ boundaryConditions[227] = 11;
+ boundaryConditions[228] = 11;
+ boundaryConditions[229] = 11;
+ boundaryConditions[230] = 11;
+ boundaryConditions[231] = 11;
+ boundaryConditions[232] = 11;
+ boundaryConditions[233] = 11;
+ boundaryConditions[234] = 11;
+ boundaryConditions[235] = 11;
+ boundaryConditions[236] = 11;
+ boundaryConditions[237] = 11;
+ boundaryConditions[238] = 11;
+ boundaryConditions[239] = 11;
+ boundaryConditions[240] = 11;
+ boundaryConditions[241] = 11;
+ boundaryConditions[242] = 11;
+ boundaryConditions[243] = 11;
+ boundaryConditions[244] = 12;
+ boundaryConditions[245] = 12;
+ boundaryConditions[246] = 11;
+ boundaryConditions[247] = 11;
+ boundaryConditions[248] = 11;
+ boundaryConditions[249] = 11;
+ boundaryConditions[250] = 11;
+ boundaryConditions[251] = 11;
+ boundaryConditions[252] = 11;
+ boundaryConditions[253] = 11;
+ boundaryConditions[254] = 11;
+ boundaryConditions[255] = 11;
+ boundaryConditions[256] = 11;
+ boundaryConditions[257] = 11;
+ boundaryConditions[258] = 11;
+ boundaryConditions[259] = 11;
+ boundaryConditions[260] = 11;
+ boundaryConditions[261] = 11;
+ boundaryConditions[262] = 11;
+ boundaryConditions[263] = 11;
+ boundaryConditions[264] = 11;
+ boundaryConditions[265] = 11;
+ boundaryConditions[266] = 11;
+ boundaryConditions[267] = 11;
+ boundaryConditions[268] = 11;
+ boundaryConditions[269] = 11;
+ boundaryConditions[270] = 11;
+ boundaryConditions[271] = 11;
+ boundaryConditions[272] = 11;
+ boundaryConditions[273] = 11;
+ boundaryConditions[274] = 11;
+ boundaryConditions[275] = 11;
+ boundaryConditions[276] = 11;
+ boundaryConditions[277] = 11;
+ boundaryConditions[278] = 11;
+ boundaryConditions[279] = 11;
+ boundaryConditions[280] = 11;
+ boundaryConditions[281] = 11;
+ boundaryConditions[282] = 11;
+ boundaryConditions[283] = 11;
+ boundaryConditions[284] = 11;
+ boundaryConditions[285] = 11;
+ boundaryConditions[286] = 11;
+ boundaryConditions[287] = 11;
+ boundaryConditions[288] = 11;
+ boundaryConditions[289] = 11;
+ boundaryConditions[290] = 11;
+ boundaryConditions[291] = 11;
+ boundaryConditions[292] = 11;
+ boundaryConditions[293] = 12;
+ boundaryConditions[294] = 12;
+ boundaryConditions[295] = 11;
+ boundaryConditions[296] = 11;
+ boundaryConditions[297] = 11;
+ boundaryConditions[298] = 11;
+ boundaryConditions[299] = 11;
+ boundaryConditions[300] = 11;
+ boundaryConditions[301] = 11;
+ boundaryConditions[302] = 11;
+ boundaryConditions[303] = 11;
+ boundaryConditions[304] = 11;
+ boundaryConditions[305] = 11;
+ boundaryConditions[306] = 11;
+ boundaryConditions[307] = 11;
+ boundaryConditions[308] = 11;
+ boundaryConditions[309] = 11;
+ boundaryConditions[310] = 11;
+ boundaryConditions[311] = 11;
+ boundaryConditions[312] = 11;
+ boundaryConditions[313] = 11;
+ boundaryConditions[314] = 11;
+ boundaryConditions[315] = 11;
+ boundaryConditions[316] = 11;
+ boundaryConditions[317] = 11;
+ boundaryConditions[318] = 11;
+ boundaryConditions[319] = 11;
+ boundaryConditions[320] = 11;
+ boundaryConditions[321] = 11;
+ boundaryConditions[322] = 11;
+ boundaryConditions[323] = 11;
+ boundaryConditions[324] = 11;
+ boundaryConditions[325] = 11;
+ boundaryConditions[326] = 11;...
[truncated message content] |
|
From: <chr...@us...> - 2009-11-04 14:47:44
|
Revision: 5468
http://fudaa.svn.sourceforge.net/fudaa/?rev=5468&view=rev
Author: chrisc83
Date: 2009-11-04 14:47:36 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
OPEN - issue PREPRO-55: G?\195?\169rer les fichiers TriGrid
http://www.fudaa.fr/jira/browse/PREPRO-55
Modified Paths:
--------------
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfGridSource.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourceDefaut.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourceMutable.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourcesAbstract.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinAdapter.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinGridSourceAdapter.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinMaillageBuilderAdapter.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/trigrid/TrigridReader.java
trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/trigrid/TestJTrigrid.java
Removed Paths:
-------------
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/GridReadResult.java
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfGridSource.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfGridSource.java 2009-11-03 17:15:24 UTC (rev 5467)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfGridSource.java 2009-11-04 14:47:36 UTC (rev 5468)
@@ -67,4 +67,5 @@
*/
double getValue(int _valueIdx,int _timeStep,int _ptIdx) throws IOException;
+ int[] getBoundaryConditions();
}
\ No newline at end of file
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourceDefaut.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourceDefaut.java 2009-11-03 17:15:24 UTC (rev 5467)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourceDefaut.java 2009-11-04 14:47:36 UTC (rev 5468)
@@ -25,10 +25,15 @@
* @param _f le format
*/
public EfGridSourceDefaut(final EfGridInterface _g, final FileFormat _f) {
- g_ = _g;
- f_ = _f;
+ this(_g, _f, new int[0]);
}
+ public EfGridSourceDefaut(final EfGridInterface _g, final FileFormat _f, int[] _b) {
+ g_ = _g;
+ f_ = _f;
+ boundaryConditions = _b;
+ }
+
/**
*
*/
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourceMutable.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourceMutable.java 2009-11-03 17:15:24 UTC (rev 5467)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourceMutable.java 2009-11-04 14:47:36 UTC (rev 5468)
@@ -24,7 +24,8 @@
double[] timesStep_;
double[][] values_;
double[][] valuesElt_;
-
+ int[] boundaryConditions;
+
public EfGridSourceMutable() {}
public boolean isElement(final int _idx) {
@@ -137,4 +138,11 @@
}
+ public int[] getBoundaryConditions() {
+ return boundaryConditions;
+ }
+
+ public void setBoundaryConditions(int[] boundaryConditions) {
+ this.boundaryConditions = boundaryConditions;
+ }
}
\ No newline at end of file
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourcesAbstract.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourcesAbstract.java 2009-11-03 17:15:24 UTC (rev 5467)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourcesAbstract.java 2009-11-04 14:47:36 UTC (rev 5468)
@@ -13,6 +13,17 @@
*/
public abstract class EfGridSourcesAbstract implements EfGridSource {
+ int[] boundaryConditions;
+
+
+ public int[] getBoundaryConditions() {
+ return boundaryConditions;
+ }
+
+ public void setBoundaryConditions(int[] boundaryConditions) {
+ this.boundaryConditions = boundaryConditions;
+ }
+
public boolean containsNodeData(){
return false;
}
Deleted: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/GridReadResult.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/GridReadResult.java 2009-11-03 17:15:24 UTC (rev 5467)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/GridReadResult.java 2009-11-04 14:47:36 UTC (rev 5468)
@@ -1,53 +0,0 @@
-package org.fudaa.dodico.ef.io;
-
-import org.fudaa.dodico.ef.impl.EfGridSourceDefaut;
-
-public class GridReadResult
-{
- EfGridSourceDefaut gridSrc;
- int[] boundaryConditions;
- String title;
-
- public GridReadResult()
- {
- this(null, null, null);
- }
-
- public GridReadResult(EfGridSourceDefaut gridSrc, int[] boundaryConditions, String title)
- {
- super();
- this.gridSrc = gridSrc;
- this.boundaryConditions = boundaryConditions;
- this.title = title;
- }
-
- public EfGridSourceDefaut getGridSrc()
- {
- return gridSrc;
- }
-
- public void setGridSrc(EfGridSourceDefaut gridSrc)
- {
- this.gridSrc = gridSrc;
- }
-
- public int[] getBoundaryConditions()
- {
- return boundaryConditions;
- }
-
- public void setBoundaryConditions(int[] boundaryConditions)
- {
- this.boundaryConditions = boundaryConditions;
- }
-
- public String getTitle()
- {
- return title;
- }
-
- public void setTitle(String title)
- {
- this.title = title;
- }
-}
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinAdapter.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinAdapter.java 2009-11-03 17:15:24 UTC (rev 5467)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinAdapter.java 2009-11-04 14:47:36 UTC (rev 5468)
@@ -26,8 +26,20 @@
* @author Fred Deniger
*/
public class SerafinAdapter implements SerafinInterface {
+ int[] boundaryConditions;
- /**
+
+ public int[] getBoundaryConditions()
+ {
+ return boundaryConditions;
+ }
+
+ public void setBoundaryConditions(int[] boundaryConditions)
+ {
+ this.boundaryConditions = boundaryConditions;
+ }
+
+/**
* @return the isVolumique
*/
public boolean isVolumique() {
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinGridSourceAdapter.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinGridSourceAdapter.java 2009-11-03 17:15:24 UTC (rev 5467)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinGridSourceAdapter.java 2009-11-04 14:47:36 UTC (rev 5468)
@@ -27,6 +27,7 @@
int[] iparam_;
EfGridSource source_;
String titre_;
+ int[] boundaryConditions;
/**
* @param _s la source
@@ -205,4 +206,14 @@
ft_.unsetDateDefini(iparam_);
}
+ public int[] getBoundaryConditions()
+ {
+ return boundaryConditions;
+ }
+
+ public void setBoundaryConditions(int[] boundaryConditions)
+ {
+ this.boundaryConditions = boundaryConditions;
+ }
+
}
\ No newline at end of file
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinMaillageBuilderAdapter.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinMaillageBuilderAdapter.java 2009-11-03 17:15:24 UTC (rev 5467)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinMaillageBuilderAdapter.java 2009-11-04 14:47:36 UTC (rev 5468)
@@ -19,6 +19,7 @@
double firstTimeStep_;
CtuluCollectionDouble[] values_;
+ int[] boundaryConditions;
/**
* Par defaut le format colonne est choisi.
@@ -87,4 +88,13 @@
isVolumique_ = _values != null && _values[0] != null && _values[0].getSize() == getGrid().getEltNb();
}
+ public int[] getBoundaryConditions()
+ {
+ return boundaryConditions;
+ }
+
+ public void setBoundaryConditions(int[] boundaryConditions)
+ {
+ this.boundaryConditions = boundaryConditions;
+ }
}
\ No newline at end of file
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/trigrid/TrigridReader.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/trigrid/TrigridReader.java 2009-11-03 17:15:24 UTC (rev 5467)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/trigrid/TrigridReader.java 2009-11-04 14:47:36 UTC (rev 5468)
@@ -13,7 +13,6 @@
import java.util.List;
import org.fudaa.ctulu.CtuluLibMessage;
-
import org.fudaa.dodico.ef.EfElement;
import org.fudaa.dodico.ef.EfElementType;
import org.fudaa.dodico.ef.EfGridSource;
@@ -51,11 +50,13 @@
in_.setJumpCommentLine(true);
EfNode[] pts = null;
EfElement[] elt = null;
+ int[] boundaryCond = null;
try {
// Premiere ligne donne le nombre de points
in_.readFields();
final int nbPoint = in_.intField(0);
pts = new EfNode[nbPoint];
+ boundaryCond = new int[nbPoint];
// 2 eme ligne : le nombre max de connexion par points
in_.readFields();
final int nbMaxVoisin = in_.intField(0);
@@ -69,6 +70,7 @@
for (int i = 0; i < nbPoint; i++) {
in_.readFields();
pts[i] = new EfNode(in_.doubleField(1), in_.doubleField(2), in_.doubleField(4));
+ boundaryCond[i] = this.getBoundaryCondition(in_.intField(3));
for (int j = 0; j < nbMaxVoisin; j++) {
m[i][j] = in_.intField(5 + j) - 1;
}
@@ -151,11 +153,71 @@
final EfGridMutable r = new EfGridMutable(pts, elt);
r.setTypeElt(EfElementType.T3);
EfLib.orienteGrid(r, progress_, true, analyze_);
- return new EfGridSourceDefaut(r, TrigridFileFormat.getInstance());
+ return new EfGridSourceDefaut(r, TrigridFileFormat.getInstance(), boundaryCond);
}
return null;
}
+ private int getBoundaryCondition(int code)
+ {
+ switch (code)
+ {
+ case 1 :
+ {
+ return 11;
+ }
+ case 2 :
+ {
+ return 4;
+ }
+ case 3 :
+ {
+ return 5;
+ }
+ case 4 :
+ {
+ return 7;
+ }
+ case 5 :
+ {
+ return 8;
+ }
+ case 6 :
+ {
+ return 9;
+ }
+ case 7 :
+ {
+ return 1;
+ }
+ case 8 :
+ {
+ return 12;
+ }
+ case 9 :
+ {
+ return 15;
+ }
+ case 10 :
+ {
+ return 2;
+ }
+ case 11 :
+ {
+ return 3;
+ }
+ case 12 :
+ {
+ return 14;
+ }
+ case 13 :
+ {
+ return 13;
+ }
+ }
+
+ return -1;
+ }
}
\ No newline at end of file
Modified: trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/trigrid/TestJTrigrid.java
===================================================================
--- trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/trigrid/TestJTrigrid.java 2009-11-03 17:15:24 UTC (rev 5467)
+++ trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/trigrid/TestJTrigrid.java 2009-11-04 14:47:36 UTC (rev 5468)
@@ -12,14 +12,12 @@
import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.CtuluLibArray;
-
import org.fudaa.dodico.common.TestIO;
import org.fudaa.dodico.ef.EfElement;
import org.fudaa.dodico.ef.EfGridInterface;
import org.fudaa.dodico.ef.EfGridSource;
import org.fudaa.dodico.ef.EfLib;
import org.fudaa.dodico.ef.io.serafin.SerafinFileFormat;
-import org.fudaa.dodico.ef.io.trigrid.TrigridFileFormat;
/**
* @author deniger
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-11-16 16:59:36
|
Revision: 5482
http://fudaa.svn.sourceforge.net/fudaa/?rev=5482&view=rev
Author: chrisc83
Date: 2009-11-16 16:59:29 +0000 (Mon, 16 Nov 2009)
Log Message:
-----------
OPEN - issue PREPRO-53: Ajout d'un panel pour le traitement du maillage
http://www.fudaa.fr/jira/browse/PREPRO-53
Modified Paths:
--------------
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/FileFormatGridVersion.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourcesAbstract.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/adcirc/AdcircFileFormat.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/corelebth/CorEleBthFileFormat.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/dunes/DunesMAIFileFormat.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinFileFormat.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinVolumeFileFormat.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/supertab/SuperTabFileFormat.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/trigrid/TrigridFileFormat.java
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/FileFormatGridVersion.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/FileFormatGridVersion.java 2009-11-16 10:51:47 UTC (rev 5481)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/FileFormatGridVersion.java 2009-11-16 16:59:29 UTC (rev 5482)
@@ -44,4 +44,18 @@
*/
CtuluIOOperationSynthese readGrid(File _f, ProgressionInterface _prog);
+ /**
+ * @return si le format de fichier contient des conditions limites.
+ */
+ boolean hasBoundaryConditons();
+
+ /**
+ * @return si le format de fichier peut lire des maillages.
+ */
+ boolean canReadGrid();
+
+ /**
+ * @return si le format de fichier peut \xE9crire des maillages.
+ */
+ boolean canWriteGrid();
}
\ No newline at end of file
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourcesAbstract.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourcesAbstract.java 2009-11-16 10:51:47 UTC (rev 5481)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/impl/EfGridSourcesAbstract.java 2009-11-16 16:59:29 UTC (rev 5482)
@@ -33,7 +33,7 @@
}
public int getTimeStepNb(){
- return 0;
+ return 1;
}
public boolean isElement(final int _idx){
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/adcirc/AdcircFileFormat.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/adcirc/AdcircFileFormat.java 2009-11-16 10:51:47 UTC (rev 5481)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/adcirc/AdcircFileFormat.java 2009-11-16 16:59:29 UTC (rev 5482)
@@ -53,4 +53,19 @@
{
return null;
}
+
+ public boolean canReadGrid()
+ {
+ return true;
+ }
+
+ public boolean canWriteGrid()
+ {
+ return false;
+ }
+
+ public boolean hasBoundaryConditons()
+ {
+ return false;
+ }
}
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/corelebth/CorEleBthFileFormat.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/corelebth/CorEleBthFileFormat.java 2009-11-16 10:51:47 UTC (rev 5481)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/corelebth/CorEleBthFileFormat.java 2009-11-16 16:59:29 UTC (rev 5482)
@@ -222,4 +222,20 @@
return true;
}
+ public boolean canReadGrid()
+ {
+ return true;
+ }
+
+ public boolean canWriteGrid()
+ {
+ return true;
+ }
+
+ public boolean hasBoundaryConditons()
+ {
+ // TODO Voir si correct
+ return false;
+ }
+
}
\ No newline at end of file
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/dunes/DunesMAIFileFormat.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/dunes/DunesMAIFileFormat.java 2009-11-16 10:51:47 UTC (rev 5481)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/dunes/DunesMAIFileFormat.java 2009-11-16 16:59:29 UTC (rev 5482)
@@ -130,4 +130,20 @@
return s;
}
+ public boolean canReadGrid()
+ {
+ return true;
+ }
+
+ public boolean canWriteGrid()
+ {
+ return true;
+ }
+
+ public boolean hasBoundaryConditons()
+ {
+ // TODO Voir si correct
+ return false;
+ }
+
}
\ No newline at end of file
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinFileFormat.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinFileFormat.java 2009-11-16 10:51:47 UTC (rev 5481)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinFileFormat.java 2009-11-16 16:59:29 UTC (rev 5482)
@@ -317,4 +317,20 @@
w.setProgressReceiver(_prog);
return w.write(_source);
}
+
+ public boolean canReadGrid()
+ {
+ return true;
+ }
+
+ public boolean canWriteGrid()
+ {
+ return true;
+ }
+
+ public boolean hasBoundaryConditons()
+ {
+ // TODO Voir si correct
+ return false;
+ }
}
\ No newline at end of file
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinVolumeFileFormat.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinVolumeFileFormat.java 2009-11-16 10:51:47 UTC (rev 5481)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinVolumeFileFormat.java 2009-11-16 16:59:29 UTC (rev 5482)
@@ -311,4 +311,20 @@
return w.write(_source);
}
+ public boolean canReadGrid()
+ {
+ return true;
+ }
+
+ public boolean canWriteGrid()
+ {
+ return true;
+ }
+
+ public boolean hasBoundaryConditons()
+ {
+ // TODO Voir si correct
+ return false;
+ }
+
}
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/supertab/SuperTabFileFormat.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/supertab/SuperTabFileFormat.java 2009-11-16 10:51:47 UTC (rev 5481)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/supertab/SuperTabFileFormat.java 2009-11-16 16:59:29 UTC (rev 5482)
@@ -53,4 +53,19 @@
{
return null;
}
+
+ public boolean canReadGrid()
+ {
+ return true;
+ }
+
+ public boolean canWriteGrid()
+ {
+ return false;
+ }
+
+ public boolean hasBoundaryConditons()
+ {
+ return true;
+ }
}
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/trigrid/TrigridFileFormat.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/trigrid/TrigridFileFormat.java 2009-11-16 10:51:47 UTC (rev 5481)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/trigrid/TrigridFileFormat.java 2009-11-16 16:59:29 UTC (rev 5482)
@@ -94,4 +94,18 @@
return write(_f, _m.getGrid(), _prog);
}
+ public boolean canReadGrid()
+ {
+ return true;
+ }
+
+ public boolean canWriteGrid()
+ {
+ return false;
+ }
+
+ public boolean hasBoundaryConditons()
+ {
+ return true;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2009-11-18 18:02:20
|
Revision: 5486
http://fudaa.svn.sourceforge.net/fudaa/?rev=5486&view=rev
Author: chrisc83
Date: 2009-11-18 18:02:05 +0000 (Wed, 18 Nov 2009)
Log Message:
-----------
OPEN - issue PREPRO-53: Ajout d'un panel pour le traitement du maillage
http://www.fudaa.fr/jira/browse/PREPRO-53
Modified Paths:
--------------
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/overstressed/EfOperationOverstressed.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/refine/EfRefinementMiddleActivity.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/renum/EfOperationRenumeration.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/adcirc/AdcircReader.java
trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/adcirc/TestAdcircReader.java
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/overstressed/EfOperationOverstressed.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/overstressed/EfOperationOverstressed.java 2009-11-17 17:11:44 UTC (rev 5485)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/overstressed/EfOperationOverstressed.java 2009-11-18 18:02:05 UTC (rev 5486)
@@ -10,9 +10,8 @@
import org.fudaa.dodico.ef.EfGridInterface;
import org.fudaa.dodico.ef.EfSegment;
import org.fudaa.dodico.ef.operation.AbstractEfOperation;
-import org.fudaa.dodico.ef.operation.EfOperation;
import org.fudaa.dodico.ef.operation.EfOperationResult;
-import org.fudaa.dodico.ef.operation.refine.*;
+import org.fudaa.dodico.ef.operation.refine.EfOperationRefine;
import org.fudaa.dodico.ef.operation.type.EfOperationToT3;
import org.fudaa.dodico.ef.operation.type.EfOperationToT6;
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/refine/EfRefinementMiddleActivity.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/refine/EfRefinementMiddleActivity.java 2009-11-17 17:11:44 UTC (rev 5485)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/refine/EfRefinementMiddleActivity.java 2009-11-18 18:02:05 UTC (rev 5486)
@@ -17,7 +17,6 @@
import org.fudaa.ctulu.CtuluListSelectionInterface;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.ProgressionUpdater;
-
import org.fudaa.dodico.commun.DodicoLib;
import org.fudaa.dodico.ef.EfElement;
import org.fudaa.dodico.ef.EfElementType;
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/renum/EfOperationRenumeration.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/renum/EfOperationRenumeration.java 2009-11-17 17:11:44 UTC (rev 5485)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/renum/EfOperationRenumeration.java 2009-11-18 18:02:05 UTC (rev 5486)
@@ -2,9 +2,6 @@
import gnu.trove.TIntIntHashMap;
-import java.util.ArrayList;
-import java.util.Collections;
-
import org.fudaa.ctulu.CtuluAnalyzeNew;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.ProgressionUpdater;
@@ -53,10 +50,10 @@
protected EfGridData process(ProgressionInterface prog, CtuluAnalyzeNew log) {
//TODO Voir si il ne faut pas que \xE7a plante si le nb de node = 0.
EfGridInterface grid = this.initGrid.getGrid();
+ grid.computeBord(prog, null);
int nbPts = grid.getPtsNb();
int nbElements = grid.getEltNb();
- int[] newIdxOldIdx = this
- .getNewIdxOldIdx(this.getPtsWeight(prog), prog);
+ int[] newIdxOldIdx = this.getNewIdxOldIdx(this.getPtsWeight(prog), prog);
int[] oldIdxNewIdx = this.getOldIdxNewIdx(newIdxOldIdx, prog);
EfElement[] elements = grid.getElts();
EfElement[] newElements = new EfElement[nbElements];
Modified: trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/adcirc/AdcircReader.java
===================================================================
--- trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/adcirc/AdcircReader.java 2009-11-17 17:11:44 UTC (rev 5485)
+++ trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/adcirc/AdcircReader.java 2009-11-18 18:02:05 UTC (rev 5486)
@@ -65,7 +65,7 @@
for (int j = 0; j < pts.length; j++)
{
- pts[j] = in_.intField(j + 2);
+ pts[j] = (in_.intField(j + 2) - 1);
}
elements[i] = new EfElement(pts);
Modified: trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/adcirc/TestAdcircReader.java
===================================================================
--- trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/adcirc/TestAdcircReader.java 2009-11-17 17:11:44 UTC (rev 5485)
+++ trunk/business/fudaa-ef/io/src/test/java/org/fudaa/dodico/ef/io/adcirc/TestAdcircReader.java 2009-11-18 18:02:05 UTC (rev 5486)
@@ -139,102 +139,102 @@
{
EfElement[] elements = new EfElement[96];
- elements[0] = new EfElement(new int[]{1, 2, 3});
- elements[1] = new EfElement(new int[]{2, 4, 3});
- elements[2] = new EfElement(new int[]{4, 2, 6});
- elements[3] = new EfElement(new int[]{6, 2, 5});
- elements[4] = new EfElement(new int[]{7, 6, 5});
- elements[5] = new EfElement(new int[]{8, 6, 7});
- elements[6] = new EfElement(new int[]{8, 7, 10});
- elements[7] = new EfElement(new int[]{10, 7, 9});
- elements[8] = new EfElement(new int[]{11, 10, 9});
- elements[9] = new EfElement(new int[]{12, 10, 11});
- elements[10] = new EfElement(new int[]{3, 13, 14});
- elements[11] = new EfElement(new int[]{4, 13, 3});
- elements[12] = new EfElement(new int[]{12, 11, 16});
- elements[13] = new EfElement(new int[]{16, 11, 15});
- elements[14] = new EfElement(new int[]{4, 6, 13});
- elements[15] = new EfElement(new int[]{6, 17, 13});
- elements[16] = new EfElement(new int[]{6, 18, 17});
- elements[17] = new EfElement(new int[]{8, 18, 6});
- elements[18] = new EfElement(new int[]{13, 20, 14});
- elements[19] = new EfElement(new int[]{19, 20, 13});
- elements[20] = new EfElement(new int[]{8, 10, 18});
- elements[21] = new EfElement(new int[]{10, 21, 18});
- elements[22] = new EfElement(new int[]{19, 13, 22});
- elements[23] = new EfElement(new int[]{22, 13, 17});
- elements[24] = new EfElement(new int[]{12, 23, 10});
- elements[25] = new EfElement(new int[]{10, 23, 21});
- elements[26] = new EfElement(new int[]{19, 25, 20});
- elements[27] = new EfElement(new int[]{20, 25, 24});
- elements[28] = new EfElement(new int[]{12, 16, 23});
- elements[29] = new EfElement(new int[]{16, 26, 23});
- elements[30] = new EfElement(new int[]{18, 22, 17});
- elements[31] = new EfElement(new int[]{27, 22, 18});
- elements[32] = new EfElement(new int[]{29, 28, 25});
- elements[33] = new EfElement(new int[]{25, 28, 24});
- elements[34] = new EfElement(new int[]{19, 22, 25});
- elements[35] = new EfElement(new int[]{25, 22, 30});
- elements[36] = new EfElement(new int[]{27, 18, 31});
- elements[37] = new EfElement(new int[]{31, 18, 21});
- elements[38] = new EfElement(new int[]{28, 33, 32});
- elements[39] = new EfElement(new int[]{29, 33, 28});
- elements[40] = new EfElement(new int[]{22, 34, 30});
- elements[41] = new EfElement(new int[]{27, 34, 22});
- elements[42] = new EfElement(new int[]{35, 33, 36});
- elements[43] = new EfElement(new int[]{32, 33, 35});
- elements[44] = new EfElement(new int[]{21, 23, 31});
- elements[45] = new EfElement(new int[]{31, 23, 37});
- elements[46] = new EfElement(new int[]{38, 25, 30});
- elements[47] = new EfElement(new int[]{29, 25, 38});
- elements[48] = new EfElement(new int[]{36, 40, 35});
- elements[49] = new EfElement(new int[]{35, 40, 39});
- elements[50] = new EfElement(new int[]{41, 23, 26});
- elements[51] = new EfElement(new int[]{37, 23, 41});
- elements[52] = new EfElement(new int[]{42, 33, 38});
- elements[53] = new EfElement(new int[]{38, 33, 29});
- elements[54] = new EfElement(new int[]{43, 34, 31});
- elements[55] = new EfElement(new int[]{31, 34, 27});
- elements[56] = new EfElement(new int[]{44, 38, 34});
- elements[57] = new EfElement(new int[]{34, 38, 30});
- elements[58] = new EfElement(new int[]{45, 33, 42});
- elements[59] = new EfElement(new int[]{36, 33, 45});
- elements[60] = new EfElement(new int[]{46, 40, 45});
- elements[61] = new EfElement(new int[]{45, 40, 36});
- elements[62] = new EfElement(new int[]{37, 47, 31});
- elements[63] = new EfElement(new int[]{31, 47, 43});
- elements[64] = new EfElement(new int[]{38, 48, 42});
- elements[65] = new EfElement(new int[]{44, 48, 38});
- elements[66] = new EfElement(new int[]{44, 34, 49});
- elements[67] = new EfElement(new int[]{49, 34, 43});
- elements[68] = new EfElement(new int[]{42, 48, 45});
- elements[69] = new EfElement(new int[]{45, 48, 50});
- elements[70] = new EfElement(new int[]{37, 41, 47});
- elements[71] = new EfElement(new int[]{47, 41, 51});
- elements[72] = new EfElement(new int[]{45, 52, 46});
- elements[73] = new EfElement(new int[]{50, 52, 45});
- elements[74] = new EfElement(new int[]{44, 49, 48});
- elements[75] = new EfElement(new int[]{48, 49, 53});
- elements[76] = new EfElement(new int[]{43, 47, 49});
- elements[77] = new EfElement(new int[]{49, 47, 54});
- elements[78] = new EfElement(new int[]{50, 48, 55});
- elements[79] = new EfElement(new int[]{55, 48, 53});
- elements[80] = new EfElement(new int[]{56, 52, 55});
- elements[81] = new EfElement(new int[]{55, 52, 50});
- elements[82] = new EfElement(new int[]{57, 47, 51});
- elements[83] = new EfElement(new int[]{54, 47, 57});
- elements[84] = new EfElement(new int[]{54, 58, 49});
- elements[85] = new EfElement(new int[]{49, 58, 53});
- elements[86] = new EfElement(new int[]{59, 55, 58});
- elements[87] = new EfElement(new int[]{58, 55, 53});
- elements[88] = new EfElement(new int[]{55, 60, 56});
- elements[89] = new EfElement(new int[]{59, 60, 55});
- elements[90] = new EfElement(new int[]{54, 57, 58});
- elements[91] = new EfElement(new int[]{58, 57, 61});
- elements[92] = new EfElement(new int[]{62, 58, 61});
- elements[93] = new EfElement(new int[]{59, 58, 62});
- elements[94] = new EfElement(new int[]{63, 60, 62});
- elements[95] = new EfElement(new int[]{62, 60, 59});
+ elements[0] = new EfElement(new int[]{0,1,2});
+ elements[1] = new EfElement(new int[]{1,3,2});
+ elements[2] = new EfElement(new int[]{3,1,5});
+ elements[3] = new EfElement(new int[]{5,1,4});
+ elements[4] = new EfElement(new int[]{6,5,4});
+ elements[5] = new EfElement(new int[]{7,5,6});
+ elements[6] = new EfElement(new int[]{7,6,9});
+ elements[7] = new EfElement(new int[]{9,6,8});
+ elements[8] = new EfElement(new int[]{10,9,8});
+ elements[9] = new EfElement(new int[]{11,9,10});
+ elements[10] = new EfElement(new int[]{2,12,13});
+ elements[11] = new EfElement(new int[]{3,12,2});
+ elements[12] = new EfElement(new int[]{11,10,15});
+ elements[13] = new EfElement(new int[]{15,10,14});
+ elements[14] = new EfElement(new int[]{3,5,12});
+ elements[15] = new EfElement(new int[]{5,16,12});
+ elements[16] = new EfElement(new int[]{5,17,16});
+ elements[17] = new EfElement(new int[]{7,17,5});
+ elements[18] = new EfElement(new int[]{12,19,13});
+ elements[19] = new EfElement(new int[]{18,19,12});
+ elements[20] = new EfElement(new int[]{7,9,17});
+ elements[21] = new EfElement(new int[]{9,20,17});
+ elements[22] = new EfElement(new int[]{18,12,21});
+ elements[23] = new EfElement(new int[]{21,12,16});
+ elements[24] = new EfElement(new int[]{11,22,9});
+ elements[25] = new EfElement(new int[]{9,22,20});
+ elements[26] = new EfElement(new int[]{18,24,19});
+ elements[27] = new EfElement(new int[]{19,24,23});
+ elements[28] = new EfElement(new int[]{11,15,22});
+ elements[29] = new EfElement(new int[]{15,25,22});
+ elements[30] = new EfElement(new int[]{17,21,16});
+ elements[31] = new EfElement(new int[]{26,21,17});
+ elements[32] = new EfElement(new int[]{28,27,24});
+ elements[33] = new EfElement(new int[]{24,27,23});
+ elements[34] = new EfElement(new int[]{18,21,24});
+ elements[35] = new EfElement(new int[]{24,21,29});
+ elements[36] = new EfElement(new int[]{26,17,30});
+ elements[37] = new EfElement(new int[]{30,17,20});
+ elements[38] = new EfElement(new int[]{27,32,31});
+ elements[39] = new EfElement(new int[]{28,32,27});
+ elements[40] = new EfElement(new int[]{21,33,29});
+ elements[41] = new EfElement(new int[]{26,33,21});
+ elements[42] = new EfElement(new int[]{34,32,35});
+ elements[43] = new EfElement(new int[]{31,32,34});
+ elements[44] = new EfElement(new int[]{20,22,30});
+ elements[45] = new EfElement(new int[]{30,22,36});
+ elements[46] = new EfElement(new int[]{37,24,29});
+ elements[47] = new EfElement(new int[]{28,24,37});
+ elements[48] = new EfElement(new int[]{35,39,34});
+ elements[49] = new EfElement(new int[]{34,39,38});
+ elements[50] = new EfElement(new int[]{40,22,25});
+ elements[51] = new EfElement(new int[]{36,22,40});
+ elements[52] = new EfElement(new int[]{41,32,37});
+ elements[53] = new EfElement(new int[]{37,32,28});
+ elements[54] = new EfElement(new int[]{42,33,30});
+ elements[55] = new EfElement(new int[]{30,33,26});
+ elements[56] = new EfElement(new int[]{43,37,33});
+ elements[57] = new EfElement(new int[]{33,37,29});
+ elements[58] = new EfElement(new int[]{44,32,41});
+ elements[59] = new EfElement(new int[]{35,32,44});
+ elements[60] = new EfElement(new int[]{45,39,44});
+ elements[61] = new EfElement(new int[]{44,39,35});
+ elements[62] = new EfElement(new int[]{36,46,30});
+ elements[63] = new EfElement(new int[]{30,46,42});
+ elements[64] = new EfElement(new int[]{37,47,41});
+ elements[65] = new EfElement(new int[]{43,47,37});
+ elements[66] = new EfElement(new int[]{43,33,48});
+ elements[67] = new EfElement(new int[]{48,33,42});
+ elements[68] = new EfElement(new int[]{41,47,44});
+ elements[69] = new EfElement(new int[]{44,47,49});
+ elements[70] = new EfElement(new int[]{36,40,46});
+ elements[71] = new EfElement(new int[]{46,40,50});
+ elements[72] = new EfElement(new int[]{44,51,45});
+ elements[73] = new EfElement(new int[]{49,51,44});
+ elements[74] = new EfElement(new int[]{43,48,47});
+ elements[75] = new EfElement(new int[]{47,48,52});
+ elements[76] = new EfElement(new int[]{42,46,48});
+ elements[77] = new EfElement(new int[]{48,46,53});
+ elements[78] = new EfElement(new int[]{49,47,54});
+ elements[79] = new EfElement(new int[]{54,47,52});
+ elements[80] = new EfElement(new int[]{55,51,54});
+ elements[81] = new EfElement(new int[]{54,51,49});
+ elements[82] = new EfElement(new int[]{56,46,50});
+ elements[83] = new EfElement(new int[]{53,46,56});
+ elements[84] = new EfElement(new int[]{53,57,48});
+ elements[85] = new EfElement(new int[]{48,57,52});
+ elements[86] = new EfElement(new int[]{58,54,57});
+ elements[87] = new EfElement(new int[]{57,54,52});
+ elements[88] = new EfElement(new int[]{54,59,55});
+ elements[89] = new EfElement(new int[]{58,59,54});
+ elements[90] = new EfElement(new int[]{53,56,57});
+ elements[91] = new EfElement(new int[]{57,56,60});
+ elements[92] = new EfElement(new int[]{61,57,60});
+ elements[93] = new EfElement(new int[]{58,57,61});
+ elements[94] = new EfElement(new int[]{62,59,61});
+ elements[95] = new EfElement(new int[]{61,59,58});
return elements;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2009-12-08 00:52:40
|
Revision: 5541
http://fudaa.svn.sourceforge.net/fudaa/?rev=5541&view=rev
Author: deniger
Date: 2009-12-08 00:52:32 +0000 (Tue, 08 Dec 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfFilterSelectedNode.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfLib.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/Messages.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/AbstractEfOperation.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfIsoActivitySearcher.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/clean/EfOperationCleanGrid.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/overstressed/EfOperationOverstressed.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/projection/EfOperationProjectionOrtho.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/refine/EfOperationRefine.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/refine/EfOperationRefineEdge.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/renum/EfOperationBackElimination.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/renum/EfOperationRenumeration.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/renum/EfOperationShufle.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/type/EfOperationToT3.java
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/type/EfOperationToT6.java
trunk/business/fudaa-ef/core/src/main/resources/org/fudaa/dodico/ef/ef.properties
trunk/business/fudaa-ef/core/src/main/resources/org/fudaa/dodico/ef/ef_en.properties
trunk/business/fudaa-ef/core/src/main/resources/org/fudaa/dodico/ef/ef_fr.properties
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/TestJSearchIso.java
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/operation/refine/TestEfOperationRefineEdge.java
trunk/business/fudaa-ef/core/src/test/java/org/fudaa/dodico/ef/operation/renum/TestEfOperationShufle.java
trunk/business/fudaa-ef/io/src/main/java/org/fudaa/dodico/ef/io/serafin/SerafinVolumeFileFormat.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/olb/exec/OLBExec.java
Removed Paths:
-------------
trunk/business/fudaa-ef/core/src/main/java/org/fudaa/ctulu/
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfFilterSelectedNode.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfFilterSelectedNode.java 2009-12-08 00:50:10 UTC (rev 5540)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfFilterSelectedNode.java 2009-12-08 00:52:32 UTC (rev 5541)
@@ -1,38 +1,43 @@
/*
- * @creation 13 mai 2005
- * @modification $Date: 2006-09-11 09:45:07 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
-* @mail de...@fu...
+ * @creation 13 mai 2005
+ *
+ * @modification $Date: 2006-09-11 09:45:07 $
+ *
+ * @license GNU General Public License 2
+ *
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ *
+ * @mail de...@fu...
*/
package org.fudaa.dodico.ef;
+import org.fudaa.ctulu.CtuluListSelection;
import org.fudaa.ctulu.CtuluListSelectionInterface;
/**
* Un filtre sur des indices de selections: Attention le constructeur peut etre long.
+ *
* @author Fred Deniger
* @version $Id: EfFilterSelectedNode.java,v 1.3 2006-09-11 09:45:07 deniger Exp $
*/
public class EfFilterSelectedNode implements EfFilter {
final CtuluListSelectionInterface selectedNode_;
- //-1 non selectione
- //0 selectionne partiellement
- //1 tout select
+ // -1 non selectione
+ // 0 selectionne partiellement
+ // 1 tout select
int[] selectedElt_;
/**
* @param _selectedPt les elements selectionn\xE9es
* @param _g
*/
- public EfFilterSelectedNode(final CtuluListSelectionInterface _selectedPt,
- final EfGridInterface _g) {
+ public EfFilterSelectedNode(final CtuluListSelectionInterface _selectedPt, final EfGridInterface _g) {
super();
selectedNode_ = _selectedPt;
if (selectedNode_ != null && !selectedNode_.isEmpty()) {
selectedElt_ = new int[_g.getEltNb()];
- //on parcourt les elements pour determiner leur etat
+ // on parcourt les elements pour determiner leur etat
for (int i = _g.getEltNb() - 1; i >= 0; i--) {
final EfElement el = _g.getElement(i);
boolean selected = false;
@@ -56,17 +61,21 @@
}
}
- public boolean isActivated(final int _idxPt){
+ public boolean isActivated(final int _idxPt) {
return selectedNode_ == null ? false : selectedNode_.isSelected(_idxPt);
}
- public boolean isActivatedElt(final int _idxElt){
- if (selectedElt_ == null || selectedElt_[_idxElt] < 0) {
- return false;
+ public CtuluListSelectionInterface getSelectedElt() {
+ CtuluListSelection res = new CtuluListSelection();
+ if (selectedElt_ == null) return res;
+ for (int i = selectedElt_.length - 1; i >= 0; i--) {
+ if (isActivatedElt(i)) res.add(i);
}
-// if (_strict) {
-// return selectedElt_[_idxElt] > 0;
-// }
+ return res;
+ }
+
+ public boolean isActivatedElt(final int _idxElt) {
+ if (selectedElt_ == null || selectedElt_[_idxElt] < 0) { return false; }
return true;
}
}
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfLib.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfLib.java 2009-12-08 00:50:10 UTC (rev 5540)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/EfLib.java 2009-12-08 00:52:32 UTC (rev 5541)
@@ -37,12 +37,8 @@
public static EfDataElement getElementData(final CtuluVariable _var, final EfData _nodeData,
final EfGridInterface _grid, InterpolationSupportValuesMultiI _datas, InterpolationVectorContainer _vects) {
- if (_nodeData == null || _grid == null) {
- return null;
- }
- if (_nodeData.isElementData()) {
- return (EfDataElement) _nodeData;
- }
+ if (_nodeData == null || _grid == null) { return null; }
+ if (_nodeData.isElementData()) { return (EfDataElement) _nodeData; }
final double[] res = new double[_grid.getEltNb()];
for (int i = res.length - 1; i >= 0; i--) {
res[i] = _grid.getElement(i).getAverage(_var, _nodeData, _datas, _vects);
@@ -51,12 +47,8 @@
}
public static EfDataElement getElementDataDanger(final EfData _nodeData, final EfGridInterface _grid) {
- if (_nodeData == null || _grid == null) {
- return null;
- }
- if (_nodeData.isElementData()) {
- return (EfDataElement) _nodeData;
- }
+ if (_nodeData == null || _grid == null) { return null; }
+ if (_nodeData.isElementData()) { return (EfDataElement) _nodeData; }
final double[] res = new double[_grid.getEltNb()];
for (int i = res.length - 1; i >= 0; i--) {
res[i] = _grid.getElement(i).getAverageDanger(_nodeData);
@@ -73,9 +65,7 @@
public static boolean isPlat(final EfElement _elt, final EfData _nodeData, final double _eps) {
final double refValues = _nodeData.getValue(_elt.getPtIndex(0));
for (int i = _elt.getPtNb() - 1; i > 0; i--) {
- if (!CtuluLib.isZero(refValues - _nodeData.getValue(_elt.getPtIndex(i)), _eps)) {
- return false;
- }
+ if (!CtuluLib.isZero(refValues - _nodeData.getValue(_elt.getPtIndex(i)), _eps)) { return false; }
}
return true;
@@ -146,9 +136,7 @@
*/
public static int[] getIdxWithOrientation(final EfGridInterface _grid, final boolean _trigo,
final ProgressionInterface _progress) {
- if (_grid == null) {
- return null;
- }
+ if (_grid == null) { return null; }
final int nbElt = _grid.getEltNb();
final TIntArrayList r = new TIntArrayList(nbElt);
// Mise en place de la progression
@@ -174,9 +162,7 @@
* @return les \xE9l\xE9ments non s\xE9lectionn\xE9s. null si param\xE8tres null ou si vide.
*/
public static CtuluListSelectionInterface getNonSelectedElt(final EfFilter _f, final EfGridInterface _grid) {
- if (_f == null || _grid == null) {
- return null;
- }
+ if (_f == null || _grid == null) { return null; }
final int eltNb = _grid.getEltNb();
final CtuluListSelection res = new CtuluListSelection(eltNb);
for (int i = 0; i < eltNb; i++) {
@@ -188,15 +174,30 @@
}
/**
+ * @param _f le filtre
+ * @param _grid le maillage
+ * @return les \xE9l\xE9ments s\xE9lectionn\xE9s. CtuluListModelSelectionEmpty.EMPTY si param\xE8tres null ou si vide.
+ */
+ public static CtuluListSelectionInterface getSelectedElt(final EfFilter _f, final EfGridInterface _grid) {
+ if (_f == null || _grid == null) { return CtuluListModelSelectionEmpty.EMPTY; }
+ final int eltNb = _grid.getEltNb();
+ final CtuluListSelection res = new CtuluListSelection(eltNb);
+ for (int i = 0; i < eltNb; i++) {
+ if (_f.isActivatedElt(i)) {
+ res.add(i);
+ }
+ }
+ return res.isEmpty() ? CtuluListModelSelectionEmpty.EMPTY : res;
+ }
+
+ /**
* @param _d les donnees a parcourir
* @param _v le tableau contenant le min,max
* @param _c une condition a respecter pour le min,max
* @return le min max des donnees _v si non null
*/
public static CtuluRange getMinMax(final EfData _d, final CtuluRange _v, final EfFilter _c) {
- if (_d == null || _d.getSize() == 0) {
- return null;
- }
+ if (_d == null || _d.getSize() == 0) { return null; }
final CtuluRange r = (_v == null) ? new CtuluRange() : _v;
r.setToNill();
boolean isInit = false;
@@ -233,25 +234,17 @@
* @return true si contenue
*/
public static boolean isContained(final int _idx, final int _minIdx, final int _maxIdx, final int _nbPt) {
- if (_minIdx <= _maxIdx) {
- return _idx >= _minIdx && _idx <= _maxIdx;
- }
+ if (_minIdx <= _maxIdx) { return _idx >= _minIdx && _idx <= _maxIdx; }
return (_idx >= _minIdx && _idx < _nbPt) || (_idx >= 0 && _idx <= _maxIdx);
}
public static String isDiffQuick(final EfGridInterface _g1, final EfGridInterface _g2) {
- if (_g1 == null || _g2 == null) {
- return DodicoLib.getS("Donn\xE9es invalides");
- }
+ if (_g1 == null || _g2 == null) { return DodicoLib.getS("Donn\xE9es invalides"); }
final int nbNodeRead = _g1.getPtsNb();
- if (nbNodeRead != _g2.getPtsNb()) {
- return DodicoLib.getS("Le nombre de noeuds est diff\xE9rent");
- }
+ if (nbNodeRead != _g2.getPtsNb()) { return DodicoLib.getS("Le nombre de noeuds est diff\xE9rent"); }
final int nbEltRead = _g1.getEltNb();
- if (nbEltRead != _g2.getEltNb()) {
- return DodicoLib.getS("Le nombre d'\xE9l\xE9ments est diff\xE9rent");
- }
+ if (nbEltRead != _g2.getEltNb()) { return DodicoLib.getS("Le nombre d'\xE9l\xE9ments est diff\xE9rent"); }
int testedNode = (int) (Math.random() * (nbNodeRead - 1));
if (testedNode > nbNodeRead - 1) {
testedNode = nbNodeRead - 1;
@@ -261,11 +254,9 @@
}
final Coordinate c = _g1.getCoor(testedNode);
final Coordinate cReprise = _g2.getCoor(testedNode);
- if (CtuluLibGeometrie.getDistanceXY(c, cReprise) > 1E-1) {
- return DodicoLib.getS("Un noeud diff\xE8re");
- }
- if (_g1.getFrontiers() != null && _g2.getFrontiers() != null && !_g1.getFrontiers().isSame(_g2.getFrontiers())) {
- return DodicoLib.getS("Les points fronti\xE8res sont diff\xE9rents");
+ if (CtuluLibGeometrie.getDistanceXY(c, cReprise) > 1E-1) { return DodicoLib.getS("Un noeud diff\xE8re"); }
+ if (_g1.getFrontiers() != null && _g2.getFrontiers() != null && !_g1.getFrontiers().isSame(_g2.getFrontiers())) { return DodicoLib
+ .getS("Les points fronti\xE8res sont diff\xE9rents");
}
return null;
@@ -321,38 +312,26 @@
* @return true si le nb de points et tous les indices sont identiques
*/
public static boolean isSameStructure(final EfGridVolumeInterface _v1, final EfGridVolumeInterface _v) {
- if (_v == null) {
- return false;
- }
+ if (_v == null) { return false; }
// on compare le nombre de points
int nV = _v.getPtsNb();
int n = _v1.getPtsNb();
- if (n != nV) {
- return false;
- }
+ if (n != nV) { return false; }
// on compare les aretes
// EfSegment[] areteV = _v.aretes_;
// on compare les nombres d'aretes
nV = _v.getNbAretes();
n = _v1.getNbAretes();
- if (n != nV) {
- return false;
- }
+ if (n != nV) { return false; }
// on compare les indices des aretes
for (int i = n - 1; i >= 0; i--) {
- if (!_v1.getArete(i).isSameIdx(_v.getArete(i))) {
- return false;
- }
+ if (!_v1.getArete(i).isSameIdx(_v.getArete(i))) { return false; }
}
nV = _v.getEltNb();
n = _v1.getEltNb();
- if (n != nV) {
- return false;
- }
+ if (n != nV) { return false; }
for (int i = n - 1; i >= 0; i--) {
- if (!_v1.getEltVolume(i).isSameStrict(_v.getEltVolume(i))) {
- return false;
- }
+ if (!_v1.getEltVolume(i).isSameStrict(_v.getEltVolume(i))) { return false; }
}
return true;
}
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/Messages.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/Messages.java 2009-12-08 00:50:10 UTC (rev 5540)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/Messages.java 2009-12-08 00:52:32 UTC (rev 5541)
@@ -8,7 +8,7 @@
{
private static final String BUNDLE_NAME = "org.fudaa.dodico.ef.ef"; //$NON-NLS-1$
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+ public static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
private Messages()
{
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/AbstractEfOperation.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/AbstractEfOperation.java 2009-12-08 00:50:10 UTC (rev 5540)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/AbstractEfOperation.java 2009-12-08 00:52:32 UTC (rev 5541)
@@ -1,17 +1,15 @@
/**
- * Licence GPL
- * Copyright Genesis
+ * Licence GPL Copyright Genesis
*/
package org.fudaa.dodico.ef.operation;
import org.fudaa.ctulu.CtuluActivity;
import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.ctulu.CtuluAnalyzeNew;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.dodico.ef.EfElementType;
import org.fudaa.dodico.ef.EfGridData;
import org.fudaa.dodico.ef.EfGridInterface;
-import org.fudaa.dodico.ef.operation.type.EfOperationToT6;
+import org.fudaa.dodico.ef.Messages;
/**
* Classe abstraite permettant de g\xE9rer la methode de stop avec une activit\xE9 courante.
@@ -60,14 +58,17 @@
public final EfOperationResult process(ProgressionInterface prog) {
EfOperationResult res = new EfOperationResult();
- res.setAnalyze(new CtuluAnalyze());
+ CtuluAnalyze analyze = new CtuluAnalyze();
+ analyze.setDefaultResourceBundle(Messages.RESOURCE_BUNDLE);
+ analyze.setDesc(getClass().getSimpleName() + ".title");
+ res.setAnalyze(analyze);
frontierChanged = false;
- res.setGridData(process(prog, new CtuluAnalyzeNew(res.getAnalyze())));
+ res.setGridData(process(prog, analyze));
res.setFrontierChanged(frontierChanged);
return res;
}
- protected abstract EfGridData process(ProgressionInterface prog, CtuluAnalyzeNew log);
+ protected abstract EfGridData process(ProgressionInterface prog, CtuluAnalyze log);
/**
* @param currentActivity the currentActivity to set
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfIsoActivitySearcher.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfIsoActivitySearcher.java 2009-12-08 00:50:10 UTC (rev 5540)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/EfIsoActivitySearcher.java 2009-12-08 00:52:32 UTC (rev 5541)
@@ -65,6 +65,11 @@
public ArrayListWithIndex(int _initialCapacity) {
super(_initialCapacity);
}
+
+ @Override
+ public boolean add(Object e) {
+ return super.add(e);
+ }
public int getIdx() {
return idx_;
@@ -137,22 +142,22 @@
private boolean isAligned(EfLineIntersection _newInter, List _dest) {
boolean align = false;
- if (_dest.size() >= 2) {
- EfLineIntersection last = (EfLineIntersection) _dest.get(_dest.size() - 1);
- // on initialise le parent qui est utilise pour r\xE9cuperer les coordonn\xE9es
- _newInter.setParent(this);
- last.setParent(this);
- tmpPt_.x = last.getX();
- tmpPt_.y = last.getY();
- tmpB_.x = _newInter.getX();
- tmpB_.y = _newInter.getY();
- last = (EfLineIntersection) _dest.get(_dest.size() - 2);
- last.setParent(this);
- tmpA_.x = last.getX();
- tmpA_.y = last.getY();
- // le nouveau point est situ\xE9 sur la droite en cours:
- align = (CGAlgorithms.distancePointLinePerpendicular(tmpPt_, tmpA_, tmpB_) <= epsForAlign_);
- }
+// if (_dest.size() >= 2) {
+// EfLineIntersection last = (EfLineIntersection) _dest.get(_dest.size() - 1);
+// // on initialise le parent qui est utilise pour r\xE9cuperer les coordonn\xE9es
+// _newInter.setParent(this);
+// last.setParent(this);
+// tmpPt_.x = last.getX();
+// tmpPt_.y = last.getY();
+// tmpB_.x = _newInter.getX();
+// tmpB_.y = _newInter.getY();
+// last = (EfLineIntersection) _dest.get(_dest.size() - 2);
+// last.setParent(this);
+// tmpA_.x = last.getX();
+// tmpA_.y = last.getY();
+// // le nouveau point est situ\xE9 sur la droite en cours:
+// align = (CGAlgorithms.distancePointLinePerpendicular(tmpPt_, tmpA_, tmpB_) <= epsForAlign_);
+// }
return align;
}
@@ -618,7 +623,7 @@
return ok;
}
-
+
private void findNexts(int _idxElt, TempResult _stockage) {
if (_stockage.getNbAvailables() == 0) return;
for (Iterator it = _stockage.iteratorOnAvail(_idxElt); it.hasNext();) {
Modified: trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/clean/EfOperationCleanGrid.java
===================================================================
--- trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/clean/EfOperationCleanGrid.java 2009-12-08 00:50:10 UTC (rev 5540)
+++ trunk/business/fudaa-ef/core/src/main/java/org/fudaa/dodico/ef/operation/clean/EfOperationCleanGrid.java 2009-12-08 00:52:32 UTC (rev 5541)
@@ -4,7 +4,7 @@
import java.util.Arrays;
-import org.fudaa.ctulu.CtuluAnalyzeNew;
+import org.fudaa.ctulu.CtuluAnalyze;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.ProgressionUpdater;
import org.fudaa.ctulu.gis.CtuluLibGeometrie;
@@ -25,7 +25,7 @@
private double minDistance;
@Override
- protected EfGridData process(ProgressionInterface prog, CtuluAnalyzeNew log) {
+ protected EfGridData process(ProgressionInterface prog, CtuluAnalyze log) {
int[] ptsOldIdxNewIdx = this.getPtsOldIdxNewIdx(prog);
int[] eltsOldIdxNewIdx = this.getEltsOldIdxNewIdx(ptsOldIdxNewIdx, prog);
TIntIntHashMap ptsNewIdxOldIdx = this.getNewIdxOldIdx(ptsOldIdxNewIdx);
@@ -53,6 +53,10 @@
}
// TODO Voir si modifier comme dans EfOperationShufle.
+ if (newNodes.length == 0) {
+ log.addError("ef.cleanGrid.allNode.eliminated");
+ return null;
+ }
EfGridInterface newGrid = new EfGrid(newNodes, newElements);
EfGridDataRenumeroteDecorator renumeroteDecorator = new EfGridDataRenumeroteDecorator(super.initGrid, newGrid);
@@ -60,8 +64,10 @@
renumeroteDecorator.setEltNewIdxOldIdxMap(eltsNewIdxOldIdx);
if (log != null) {
- log.addInfo("ef.cleanGrid.log", nodes.length - newNodes.length, elements.length - newElements.length,
- newNodes.length, newElements.length);
+ log.addInfo("ef.cleanGrid.node.elimine.log", nodes.length - newNodes.length);
+ log.addInfo("ef.cleanGrid.mesh.elimine.log", elements.length - newElements.length);
+ log.addInfo("ef.operation.log.newPt.nb", newNodes.length);
+ log.addInfo("ef.operation.log.newEle.nb", newElements.length);
}
return renumeroteDecorator;
@@ -94,7 +100,7 @@
ProgressionUpdater updater = new ProgressionUpdater(prog);
int currentIdx = 0;
- updater.majProgessionStateOnly("ef.cleanGrid.getEltsOldIdxNewIdx.msg");
+ updater.majProgessionStateOnly(Messages.getString("ef.cleanGrid.getEltsOldIdxNewIdx.msg"));
updater.setValue(10, oldIdxNewIdx.length);
Arrays.fill(oldIdxNewIdx, -1);
@@ -175,7 +181,7 @@
int currentIdx = 0;
ProgressionUpdater updater = new ProgressionUpdater(prog);
- updater.majProgessionStateOnly("ef.cleanGrid.getPtsOldIdxNewIdx.msg");
+ updater.majProgessionStateOnly(Messages.getString("ef.cleanGrid.getPtsOldIdxNewIdx.msg"));
updater.setValue(10, elements.length + oldIdxNewIdx.length);
Arrays.fill(oldIdxNewIdx, -1);
@@ -183,10 +189,11 @@
for (int i = 0; i < elements.length; i++) {
if (this.stop) return new int[0];
- int[] ptsIdx = elements[i].getIndices();
-
- for (int j = 0; j < ptsIdx.length; j++) {
- oldIdxNewIdx[ptsIdx[j]] = ptsIdx[j];
+ // int[] ptsIdx = elements[i].getIndices();
+ int nb = elements[i].getPtNb();
+ for (int j = 0; j < nb; j++) {
+ int idxPt = elements[i].getPtIndex(j);
+ oldIdxNewIdx[idxPt] = idxPt;
}
updater.majAvancement();
@@ -262,236 +269,4 @@
this.minDistance = minDistance;
}
- /**
- * @param elementsNewPts le tableau d'\xE9l\xE9ments avec les nouveaux points.
- * @param newIdxOldIdx le tableau contenant pour chaque indice l'ancien l'indice de l'\xE9l\xE9ment repr\xE9sent\xE9.
- * @param prog le manager de progression.
- * @return un tableau contenant les nouveaux \xE9l\xE9ments.
- */
- /*
- * private EfElement[] getNewElements(EfElement[] elementsNewPts, int[] newIdxOldIdx, ProgressionInterface prog) {
- * EfElement[] newElements = new EfElement[newIdxOldIdx.length]; ProgressionUpdater updater = new
- * ProgressionUpdater(prog);
- *
- * updater.majProgessionStateOnly("ef.cleanGrid.getEltNewIdxOldIdx.msg"); updater.setValue(10, newIdxOldIdx.length);
- *
- * for (int i = 0; i < newIdxOldIdx.length; i++) { if (this.stop) return new EfElement[0];
- *
- * newElements[i] = new EfElement(elementsNewPts[newIdxOldIdx[i]].getIndices());
- *
- * updater.majAvancement(); }
- *
- * return newElements; }
- *
- * /**
- *
- * @param eltsToEliminate le tableau permettant de savoir si un \xE9l\xE9ment doit \xEAtre supprim\xE9.
- *
- * @param prog le manager de progression.
- *
- * @return un tableau contenant pour chaque indice l'ancien l'indice de l'\xE9l\xE9ments repr\xE9sent\xE9.
- *//*
- * private int[] getEltNewIdxOldIdx(boolean[] eltsToEliminate, ProgressionInterface prog) { int[] newIdxOldIdx =
- * new int[this.getNewNbElts(eltsToEliminate, prog)]; int currentIdx = 0; ProgressionUpdater updater = new
- * ProgressionUpdater(prog);
- *
- * updater.majProgessionStateOnly("ef.cleanGrid.getEltNewIdxOldIdx.msg"); updater.setValue(10,
- * eltsToEliminate.length);
- *
- * for (int i = 0; i < eltsToEliminate.length; i++) { if (this.stop) return new int[0];
- *
- * if (!eltsToEliminate[i]) { newIdxOldIdx[currentIdx] = i;
- *
- * currentIdx++; }
- *
- * updater.majAvancement(); }
- *
- * return newIdxOldIdx; }
- *
- * /** TODO: le tableau de boolean aurait pu etre remplace par CtuluListSelection qui donne deja les methodes pour
- * compter..
- *
- * @param eltsToEliminate le tableau permettant de savoir si un \xE9l\xE9ment doit \xEAtre supprim\xE9.
- *
- * @param prog le manager de progression.
- *
- * @return le nombre d'\xE9l\xE9ment ne devant pas \xEAtre supprim\xE9 contenu dans le tableau.
- *//*
- * private int getNewNbElts(boolean[] eltsToEliminate, ProgressionInterface prog) { int newNbElts = 0;
- *
- * for (int i = 0; i < eltsToEliminate.length; i++) { if (!eltsToEliminate[i]) { newNbElts++; } }
- *
- * return newNbElts; }
- *
- * /**
- *
- * @param elementsNewPts le tableau d'\xE9l\xE9ments avec les nouveaux points.
- *
- * @param prog le manager de progression.
- *
- * @return un tableau contenant true si l'\xE9l\xE9ment correspondant doit \xEAtre supprim\xE9.
- *//*
- * private boolean[] getEltsToEliminate(EfElement[] elementsNewPts, ProgressionInterface prog) { boolean[]
- * eltsToEliminate = new boolean[elementsNewPts.length]; ProgressionUpdater updater = new
- * ProgressionUpdater(prog);
- *
- * updater.majProgessionStateOnly("ef.cleanGrid.getEltsToEliminate.msg"); updater.setValue(10, (2 *
- * elementsNewPts.length) - 1);
- *
- * for (int i = 0; i < eltsToEliminate.length; i++) { if(this.stop) return new boolean[0];
- *
- * eltsToEliminate[i] = this.isDegenerated(elementsNewPts[i].getIndices());
- *
- * updater.majAvancement(); }
- *
- * for (int i = 0; i < (eltsToEliminate.length - 1); i++) { if(this.stop) return new boolean[0];
- *
- * if (!eltsToEliminate[i]) { for (int j = (i + 1); j < eltsToEliminate.length; j++) { if(this.stop) return
- * new boolean[0];
- *
- * if (!eltsToEliminate[j]) { eltsToEliminate[j] = this.isSuperposed(elementsNewPts[i].getIndices(),
- * elementsNewPts[j].getIndices()); } } }
- *
- * updater.majAvancement(); }
- *
- * return eltsToEliminate; }
- *
- * /**
- *
- * @param prog le manager de progression.
- *
- * @return un tableau contenant pour chaque indice -1 si le point n'est pas utilis\xE9 ou l'indice du point qui
- * doit le remplacer.
- *//*
- * private int[] getCleanIdx(ProgressionInterface prog) { EfGridInterface grid = this.initGrid.getGrid();
- * int[] cleanIdx = new int[grid.getPtsNb()]; EfElement[] elements = grid.getElts(); EfNode[] nodes =
- * grid.getNodes(); ProgressionUpdater updater = new ProgressionUpdater(prog);
- *
- * updater.majProgessionStateOnly("ef.cleanGrid.getCleanIdx.msg"); updater.setValue(10, elements.length +
- * cleanIdx.length - 1);
- *
- * Arrays.fill(cleanIdx, -1);
- *
- * for (int i = 0; i < elements.length; i++) { if (this.stop) return new int[0];
- *
- * int[] ptsIdx = elements[i].getIndices();
- *
- * for (int j = 0; j < ptsIdx.length; j++) { cleanIdx[ptsIdx[j]] = ptsIdx[j]; }
- *
- * updater.majAvancement(); }
- *
- * for (int i = 0; i < (cleanIdx.length - 1); i++) { if (this.stop) return new int[0];
- *
- * if (cleanIdx[i] == i) { for (int j = (i + 1); j < cleanIdx.length; j++) { if (this.stop) return new
- * int[0];
- *
- * if (cleanIdx[j] == j) { double distance = CtuluLibGeometrie.getDistance(nodes[i].getX(),
- * nodes[i].getY(), nodes[j].getX(), nodes[j].getY());
- *
- * if (distance < this.minDistance) { cleanIdx[j] = i; } } } }
- *
- * updater.majAvancement(); }
- *
- * return cleanIdx; }
- *
- * /**
- *
- * @param cleanIdx le tableau contenant les nouveau indice utilis\xE9.
- *
- * @return le nombre de point diff\xE9rent contenu dans le tableau.
- *//*
- * private int getNewNbPts(int[] cleanIdx) { int newNbPts = 0;
- *
- * for (int i = 0; i < cleanIdx.length; i++) { if (cleanIdx[i] == i) { newNbPts++; } }
- *
- * return newNbPts; }
- *
- * /**
- *
- * @param cleanIdx le tableau contenant les nouveau indice utilis\xE9.
- *
- * @param prog le manager de progression.
- *
- * @return un tableau contenant pour chaque indice l'ancien l'indice du point repr\xE9sent\xE9.
- *//*
- * private int[] getPtsNewIdxOldIdx(int[] cleanIdx, ProgressionInterface prog) { int[] newIdxOldIdx
- * = new int[this.getNewNbPts(cleanIdx)]; int currentIdx = 0; ProgressionUpdater updater = new
- * ProgressionUpdater(prog);
- *
- * updater.majProgessionStateOnly("ef.cleanGrid.getPtsNewIdxOldIdx.msg"); updater.setValue(10,
- * newIdxOldIdx.length);
- *
- ...
[truncated message content] |
|
From: <bma...@us...> - 2011-03-10 10:57:57
|
Revision: 6149
http://fudaa.svn.sourceforge.net/fudaa/?rev=6149&view=rev
Author: bmarchan
Date: 2011-03-10 10:57:50 +0000 (Thu, 10 Mar 2011)
Log Message:
-----------
[maven-release-plugin] prepare release fudaa-ef-1.1
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2011-03-07 15:07:18 UTC (rev 6148)
+++ trunk/business/fudaa-ef/core/pom.xml 2011-03-10 10:57:50 UTC (rev 6149)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-core</artifactId>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2011-03-07 15:07:18 UTC (rev 6148)
+++ trunk/business/fudaa-ef/io/pom.xml 2011-03-10 10:57:50 UTC (rev 6149)
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-io</artifactId>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2011-03-07 15:07:18 UTC (rev 6148)
+++ trunk/business/fudaa-ef/pom.xml 2011-03-10 10:57:50 UTC (rev 6149)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<properties>
- <fudaa-framework.version>1.1-SNAPSHOT</fudaa-framework.version>
+ <fudaa-framework.version>1.1</fudaa-framework.version>
</properties>
<parent>
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
<modules>
@@ -56,4 +56,10 @@
<!-- </dependency>-->
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.1</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.1</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/fudaa-ef-1.1</url>
+ </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2011-03-10 10:58:22
|
Revision: 6151
http://fudaa.svn.sourceforge.net/fudaa/?rev=6151&view=rev
Author: bmarchan
Date: 2011-03-10 10:58:15 +0000 (Thu, 10 Mar 2011)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2011-03-10 10:58:06 UTC (rev 6150)
+++ trunk/business/fudaa-ef/core/pom.xml 2011-03-10 10:58:15 UTC (rev 6151)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-core</artifactId>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2011-03-10 10:58:06 UTC (rev 6150)
+++ trunk/business/fudaa-ef/io/pom.xml 2011-03-10 10:58:15 UTC (rev 6151)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>ef-io</artifactId>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2011-03-10 10:58:06 UTC (rev 6150)
+++ trunk/business/fudaa-ef/pom.xml 2011-03-10 10:58:15 UTC (rev 6151)
@@ -13,7 +13,7 @@
</parent>
<groupId>org.fudaa.business.fudaa-ef</groupId>
<artifactId>fudaa-ef</artifactId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
<name>Fudaa-Ef Elements finis</name>
<packaging>pom</packaging>
<modules>
@@ -56,10 +56,4 @@
<!-- </dependency>-->
</dependencies>
</dependencyManagement>
-
- <scm>
- <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.1</connection>
- <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.1</developerConnection>
- <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/fudaa-ef-1.1</url>
- </scm>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <de...@us...> - 2012-03-24 02:29:37
|
Revision: 7009
http://fudaa.svn.sourceforge.net/fudaa/?rev=7009&view=rev
Author: deniger
Date: 2012-03-24 02:29:31 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
[maven-release-plugin] prepare release fudaa-ef-1.2
Modified Paths:
--------------
trunk/business/fudaa-ef/core/pom.xml
trunk/business/fudaa-ef/io/pom.xml
trunk/business/fudaa-ef/pom.xml
Modified: trunk/business/fudaa-ef/core/pom.xml
===================================================================
--- trunk/business/fudaa-ef/core/pom.xml 2012-03-24 02:28:55 UTC (rev 7008)
+++ trunk/business/fudaa-ef/core/pom.xml 2012-03-24 02:29:31 UTC (rev 7009)
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>fudaa-ef</artifactId>
- <version>1.2-SNAPSHOT</version>
- </parent>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-core</artifactId>
- <name>EF Core</name>
- <dependencies>
- <dependency>
- <groupId>${ctuluGroupId}</groupId>
- <artifactId>ctulu-gis</artifactId>
- </dependency>
- <dependency>
- <groupId>${dodicoGroupId}</groupId>
- <artifactId>dodico-common</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <versionRange>[1.3,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>fudaa-ef</artifactId>
+ <version>1.2</version>
+ </parent>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-core</artifactId>
+ <name>EF Core</name>
+ <dependencies>
+ <dependency>
+ <groupId>${ctuluGroupId}</groupId>
+ <artifactId>ctulu-gis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${dodicoGroupId}</groupId>
+ <artifactId>dodico-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <versionRange>[1.3,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
Modified: trunk/business/fudaa-ef/io/pom.xml
===================================================================
--- trunk/business/fudaa-ef/io/pom.xml 2012-03-24 02:28:55 UTC (rev 7008)
+++ trunk/business/fudaa-ef/io/pom.xml 2012-03-24 02:29:31 UTC (rev 7009)
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>fudaa-ef</artifactId>
- <version>1.2-SNAPSHOT</version>
- </parent>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-io</artifactId>
- <name>EF Input/Output</name>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
- <artifactId>dico-ui</artifactId>
- </dependency>
- <dependency>
- <groupId>org.fudaa.framework.dodico</groupId>
- <artifactId>dodico-common</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <versionRange>[1.3,)</versionRange>
- <goals>
- <goal>run</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>fudaa-ef</artifactId>
+ <version>1.2</version>
+ </parent>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-io</artifactId>
+ <name>EF Input/Output</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.fudaa.fudaa-dico</groupId>
+ <artifactId>dico-ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.framework.dodico</groupId>
+ <artifactId>dodico-common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <versionRange>[1.3,)</versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
Modified: trunk/business/fudaa-ef/pom.xml
===================================================================
--- trunk/business/fudaa-ef/pom.xml 2012-03-24 02:28:55 UTC (rev 7008)
+++ trunk/business/fudaa-ef/pom.xml 2012-03-24 02:29:31 UTC (rev 7009)
@@ -1,57 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <properties>
- <fudaa-framework.version>1.2</fudaa-framework.version>
- <projetEncoding>ISO-8859-15</projetEncoding>
- <!-- la version du compiler -->
- <javaCompiler>1.6</javaCompiler>
- </properties>
-
- <parent>
- <groupId>org.fudaa.pom</groupId>
- <artifactId>business-pom</artifactId>
- <version>1.2</version>
- </parent>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>fudaa-ef</artifactId>
- <version>1.2-SNAPSHOT</version>
- <name>Fudaa-Ef Elements finis</name>
- <packaging>pom</packaging>
- <modules>
- <module>io</module>
- <module>core</module>
- <!--
- <module>client</module> a decommenter des que dependences résolues
- -->
- </modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.fudaa.framework</groupId>
- <artifactId>fudaa-framework</artifactId>
- <version>${fudaa-framework.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.fudaa.business.fudaa-ef</groupId>
- <artifactId>ef-io</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <properties>
+ <fudaa-framework.version>1.2</fudaa-framework.version>
+ <projetEncoding>ISO-8859-15</projetEncoding>
+ <!-- la version du compiler -->
+ <javaCompiler>1.6</javaCompiler>
+ </properties>
+
+ <parent>
+ <groupId>org.fudaa.pom</groupId>
+ <artifactId>business-pom</artifactId>
+ <version>1.2</version>
+ </parent>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>fudaa-ef</artifactId>
+ <version>1.2</version>
+ <name>Fudaa-Ef Elements finis</name>
+ <packaging>pom</packaging>
+ <modules>
+ <module>io</module>
+ <module>core</module>
+ <!--
+ <module>client</module> a decommenter des que dependences résolues
+ -->
+ </modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.fudaa.framework</groupId>
+ <artifactId>fudaa-framework</artifactId>
+ <version>${fudaa-framework.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-core</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.fudaa.business.fudaa-ef</groupId>
+ <artifactId>ef-io</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.2</connection>
+ <developerConnection>scm:svn:https://fudaa.svn.sourceforge.net/svnroot/fudaa/tags/business/fudaa-ef-1.2</developerConnection>
+ <url>http://fudaa.svn.sourceforge.net/viewvc/fudaa/svnroot/fudaa/tags/business/fudaa-ef-1.2</url>
+ </scm>
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X