Commit eec1e8c5 authored by guillaume.garbay's avatar guillaume.garbay
Browse files

Shape affiché mais pas dans la bonne fenêtre...

1 merge request!1Add Svn history
Showing with 6157 additions and 14 deletions
+6157 -14
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
......
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.compiler.source=1.8
This diff is collapsed.
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
<blue>255</blue> <blue>255</blue>
<alpha>255</alpha> <alpha>255</alpha>
</shapeColor> </shapeColor>
<!--shape>//data//input//shape//hsi_BROAUTOMNE507.shp</shape-->
</pikelake.environment.Movement2DWithinShapeObserver> </pikelake.environment.Movement2DWithinShapeObserver>
</observers> </observers>
</fr.cemagref.observation.kernel.ObservablesHandler> </fr.cemagref.observation.kernel.ObservablesHandler>
......
File added
PROJCS["RGF93_Lambert_93",GEOGCS["GCS_RGF_1993",DATUM["D_RGF_1993",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic"],PARAMETER["False_Easting",700000.0],PARAMETER["False_Northing",6600000.0],PARAMETER["Central_Meridian",3.0],PARAMETER["Standard_Parallel_1",44.0],PARAMETER["Standard_Parallel_2",49.0],PARAMETER["Latitude_Of_Origin",46.5],UNIT["Meter",1.0]]
\ No newline at end of file
File added
File added
File added
<?xml version="1.0"?>
<!--<!DOCTYPE metadata SYSTEM "http://www.esri.com/metadata/esriprof80.dtd">-->
<metadata xml:lang="fr"><Esri><CreaDate>20140210</CreaDate><CreaTime>17093400</CreaTime><SyncOnce>FALSE</SyncOnce><SyncDate>20110810</SyncDate><SyncTime>17220800</SyncTime><ModDate>20110810</ModDate><ModTime>17220800</ModTime><DataProperties><lineage><Process ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\CopyFeatures" Date="20110727" Time="152227">CopyFeatures X:\SIGHYAX\Eau_Hydrographie\hydrologie\france\Plan_deau\BD-Topo-ASSEMBLAGE_cemagref\LacTopoAG_perm_int.shp "X:\SIGHYAX\Eau_Hydrographie\hydrologie\france\Plan_deau\BD-Topo-ASSEMBLAGE_cemagref\New Personal Geodatabase.mdb\LacTopoAG_perm_int" # 0 0 0</Process><Process ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\CopyFeatures" Date="20110727" Time="154539">CopyFeatures X:\SIGHYAX\Eau_Hydrographie\hydrologie\france\Plan_deau\BD-Topo-ASSEMBLAGE_cemagref\LacTopo.mdb\LacTopoAG_perm_int "X:\SIGHYAX\Eau_Hydrographie\hydrologie\france\Plan_deau\BD-Topo-ASSEMBLAGE_cemagref\New Folder (2)\LacTopoAG_perm_int.shp" # 0 0 0</Process><Process ToolSource="C:\Program Files\ArcGIS\ArcToolbox\Toolboxes\Data Management Tools.tbx\Dissolve" Date="20110810" Time="172345">Dissolve plandoTopo X:\SIGHYAX\Eau_Hydrographie\hydrologie\france\Plan_deau\BD-Topo-ASSEMBLAGE_cemagref\plandoTopo_Dissolve.shp Code_Lac # MULTI_PART DISSOLVE_LINES</Process></lineage><itemProps><itemLocation><linkage Sync="TRUE">file://\\dataperso\perso\Samuel.Westrelin\HYAX.mod\Bariousses\FromNat\TRE19_BDTopo_513m_ok</linkage><protocol Sync="TRUE">Local Area Network</protocol></itemLocation></itemProps><copyHistory><copy source="D:\Projets_SIG\Alti_Bariousses\TRE19_BDTopo_513m_ok" dest="\\dataperso\perso\Samuel.Westrelin\HYAX.mod\Bariousses\FromNat\TRE19_BDTopo_513m_ok" date="20140210" time="17093400"></copy></copyHistory></DataProperties></Esri><idinfo><native Sync="TRUE">Microsoft Windows XP Version 5.1 (Build 2600) Service Pack 3; ESRI ArcCatalog 9.3.1.3000</native><descript><langdata Sync="TRUE">fr</langdata><abstract>REQUIRED: A brief narrative summary of the data set.</abstract><purpose>REQUIRED: A summary of the intentions with which the data set was developed.</purpose></descript><citation><citeinfo><origin>REQUIRED: The name of an organization or individual that developed the data set.</origin><pubdate>REQUIRED: The date when the data set is published or otherwise made available for release.</pubdate><title Sync="TRUE">plandoTopo_Dissolve</title><ftname Sync="TRUE">plandoTopo_Dissolve</ftname><geoform Sync="TRUE">vector digital data</geoform><onlink Sync="TRUE">\\datasig\data_hyax\SIGHYAX\Eau_Hydrographie\hydrologie\france\Plan_deau\BD-Topo-ASSEMBLAGE_cemagref\plandoTopo_Dissolve.shp</onlink></citeinfo></citation><timeperd><current>REQUIRED: The basis on which the time period of content information is determined.</current><timeinfo><sngdate><caldate>REQUIRED: The year (and optionally month, or month and day) for which the data set corresponds to the ground.</caldate></sngdate></timeinfo></timeperd><status><progress>REQUIRED: The state of the data set.</progress><update>REQUIRED: The frequency with which changes and additions are made to the data set after the initial data set is completed.</update></status><spdom><bounding><westbc Sync="TRUE">REQUIRED: Western-most coordinate of the limit of coverage expressed in longitude.</westbc><eastbc Sync="TRUE">REQUIRED: Eastern-most coordinate of the limit of coverage expressed in longitude.</eastbc><northbc Sync="TRUE">REQUIRED: Northern-most coordinate of the limit of coverage expressed in latitude.</northbc><southbc Sync="TRUE">REQUIRED: Southern-most coordinate of the limit of coverage expressed in latitude.</southbc></bounding></spdom><keywords><theme><themekt>REQUIRED: Reference to a formally registered thesaurus or a similar authoritative source of theme keywords.</themekt><themekey>REQUIRED: Common-use word or phrase used to describe the subject of the data set.</themekey></theme></keywords><accconst>REQUIRED: Restrictions and legal prerequisites for accessing the data set.</accconst><useconst>REQUIRED: Restrictions and legal prerequisites for using the data set after access is granted.</useconst><natvform Sync="TRUE">Shapefile</natvform></idinfo><dataIdInfo><envirDesc Sync="TRUE">Microsoft Windows XP Version 5.1 (Build 2600) Service Pack 3; ESRI ArcCatalog 9.3.1.3000</envirDesc><dataLang><languageCode Sync="TRUE" value="fr"></languageCode></dataLang><idCitation><resTitle Sync="TRUE">plandoTopo_Dissolve</resTitle><presForm><PresFormCd Sync="TRUE" value="005"></PresFormCd></presForm></idCitation><spatRpType><SpatRepTypCd Sync="TRUE" value="001"></SpatRepTypCd></spatRpType></dataIdInfo><metainfo><langmeta Sync="TRUE">fr</langmeta><metstdn Sync="TRUE">FGDC Content Standards for Digital Geospatial Metadata</metstdn><metstdv Sync="TRUE">FGDC-STD-001-1998</metstdv><mettc Sync="TRUE">local time</mettc><metc><cntinfo><cntorgp><cntper>REQUIRED: The person responsible for the metadata information.</cntper><cntorg>REQUIRED: The organization responsible for the metadata information.</cntorg></cntorgp><cntaddr><addrtype>REQUIRED: The mailing and/or physical address for the organization or individual.</addrtype><city>REQUIRED: The city of the address.</city><state>REQUIRED: The state or province of the address.</state><postal>REQUIRED: The ZIP or other postal code of the address.</postal></cntaddr><cntvoice>REQUIRED: The telephone number by which individuals can speak to the organization or individual.</cntvoice></cntinfo></metc><metd Sync="TRUE">20110810</metd><metextns><onlink Sync="TRUE">http://www.esri.com/metadata/esriprof80.html</onlink><metprof Sync="TRUE">ESRI Metadata Profile</metprof></metextns></metainfo><mdLang><languageCode Sync="TRUE" value="fr"></languageCode></mdLang><mdStanName Sync="TRUE">ISO 19115 Geographic Information - Metadata</mdStanName><mdStanVer Sync="TRUE">DIS_ESRI1.0</mdStanVer><mdChar><CharSetCd Sync="TRUE" value="004"></CharSetCd></mdChar><mdHrLv><ScopeCd Sync="TRUE" value="005"></ScopeCd></mdHrLv><mdHrLvName Sync="TRUE">dataset</mdHrLvName><distinfo><resdesc Sync="TRUE">Downloadable Data</resdesc><stdorder><digform><digtinfo><transize Sync="TRUE">0.000</transize><dssize Sync="TRUE">0.000</dssize></digtinfo></digform></stdorder></distinfo><distInfo><distributor><distorTran><onLineSrc><orDesc Sync="TRUE">002</orDesc><linkage Sync="TRUE">file://\\datasig\data_hyax\SIGHYAX\Eau_Hydrographie\hydrologie\france\Plan_deau\BD-Topo-ASSEMBLAGE_cemagref\plandoTopo_Dissolve.shp</linkage><protocol Sync="TRUE">Local Area Network</protocol></onLineSrc><transSize Sync="TRUE">0.000</transSize></distorTran><distorFormat><formatName Sync="TRUE">Shapefile</formatName></distorFormat></distributor></distInfo><spdoinfo><direct Sync="TRUE">Vector</direct><ptvctinf><esriterm Name="plandoTopo_Dissolve"><efeatyp Sync="TRUE">Simple</efeatyp><efeageom Sync="TRUE">Polygon</efeageom><esritopo Sync="TRUE">FALSE</esritopo><efeacnt Sync="TRUE">0</efeacnt><spindex Sync="TRUE">FALSE</spindex><linrefer Sync="TRUE">TRUE</linrefer></esriterm><sdtsterm Name="plandoTopo_Dissolve"><sdtstype Sync="TRUE">G-polygon</sdtstype><ptvctcnt Sync="TRUE">0</ptvctcnt></sdtsterm></ptvctinf></spdoinfo><spref><horizsys><cordsysn><geogcsn Sync="TRUE">GCS_RGF_1993</geogcsn><projcsn Sync="TRUE">RGF93_Lambert_93</projcsn></cordsysn><planar><planci><plance Sync="TRUE">coordinate pair</plance><plandu Sync="TRUE">meters</plandu><coordrep><absres Sync="TRUE">0.000000</absres><ordres Sync="TRUE">0.000000</ordres></coordrep></planci><mapproj><mapprojn Sync="TRUE">Lambert Conformal Conic</mapprojn><lambertc><stdparll Sync="TRUE">44.000000</stdparll><stdparll Sync="TRUE">49.000000</stdparll><longcm Sync="TRUE">3.000000</longcm><latprjo Sync="TRUE">46.500000</latprjo><feast Sync="TRUE">700000.000000</feast><fnorth Sync="TRUE">6600000.000000</fnorth></lambertc></mapproj></planar><geodetic><horizdn Sync="TRUE">D_RGF_1993</horizdn><ellips Sync="TRUE">Geodetic Reference System 80</ellips><semiaxis Sync="TRUE">6378137.000000</semiaxis><denflat Sync="TRUE">298.257222</denflat></geodetic></horizsys><vertdef><altsys><altenc Sync="TRUE">Explicit elevation coordinate included with horizontal coordinates</altenc><altres Sync="TRUE">0.000100</altres></altsys></vertdef></spref><refSysInfo><RefSystem><refSysID><identCode Sync="TRUE">RGF93_Lambert_93</identCode></refSysID></RefSystem></refSysInfo><spatRepInfo><VectSpatRep><topLvl><TopoLevCd Sync="TRUE" value="001"></TopoLevCd></topLvl><geometObjs Name="plandoTopo_Dissolve"><geoObjTyp><GeoObjTypCd Sync="TRUE" value="001"></GeoObjTypCd></geoObjTyp><geoObjCnt Sync="TRUE">0</geoObjCnt></geometObjs></VectSpatRep></spatRepInfo><eainfo><detailed Name="plandoTopo_Dissolve"><enttyp><enttypl Sync="TRUE">plandoTopo_Dissolve</enttypl><enttypt Sync="TRUE">Feature Class</enttypt><enttypc Sync="TRUE">0</enttypc></enttyp><attr><attrlabl Sync="TRUE">FID</attrlabl><attalias Sync="TRUE">FID</attalias><attrtype Sync="TRUE">OID</attrtype><attwidth Sync="TRUE">4</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale><attrdef Sync="TRUE">Internal feature number.</attrdef><attrdefs Sync="TRUE">ESRI</attrdefs><attrdomv><udom Sync="TRUE">Sequential unique whole numbers that are automatically generated.</udom></attrdomv></attr><attr><attrlabl Sync="TRUE">Shape</attrlabl><attalias Sync="TRUE">Shape</attalias><attrtype Sync="TRUE">Geometry</attrtype><attwidth Sync="TRUE">0</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale><attrdef Sync="TRUE">Feature geometry.</attrdef><attrdefs Sync="TRUE">ESRI</attrdefs><attrdomv><udom Sync="TRUE">Coordinates defining the features.</udom></attrdomv></attr><attr><attrlabl Sync="TRUE">Code_Lac</attrlabl><attalias Sync="TRUE">Code_Lac</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">10</attwidth></attr></detailed></eainfo><mdDateSt Sync="TRUE">20110810</mdDateSt><dataqual><lineage><procstep><procdesc Sync="TRUE">Dataset moved.</procdesc><srcused Sync="TRUE">X:\SIGHYAX\Eau_Hydrographie\hydrologie\france\Plan_deau\BD-Topo-ASSEMBLAGE_cemagref\New Folder (2)\LacTopoAG_perm_int</srcused><procdate Sync="TRUE">20110727</procdate><proctime Sync="TRUE">15475300</proctime></procstep><procstep><procdesc Sync="TRUE">Dataset copied.</procdesc><srcused Sync="TRUE">X:\SIGHYAX\Eau_Hydrographie\hydrologie\france\Plan_deau\BD-Topo-ASSEMBLAGE_cemagref\LacTopoAG_perm_int</srcused><procdate Sync="TRUE">20110810</procdate><proctime Sync="TRUE">17180800</proctime></procstep></lineage></dataqual></metadata>
File added
File added
File added
File added
File added
File added
File added
File added
package pikelake; package pikelake;
import fr.cemagref.simaqualife.extensions.spatial2D.Grid2D; //import java.io.File;
//import fr.cemagref.simaqualife.extensions.spatial2D.Grid2D.NeighborsType; //import java.io.FileNotFoundException;
import fr.cemagref.simaqualife.kernel.AquaNismsGroup;
import fr.cemagref.simaqualife.kernel.util.TransientParameters.InitTransientParameters;
import fr.cemagref.simaqualife.pilot.Pilot;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
//import java.util.Scanner;
//import java.util.StringTokenizer;
import pikelake.pikes.Pike; import pikelake.pikes.Pike;
import umontreal.iro.lecuyer.probdist.UniformDist;
import umontreal.iro.lecuyer.randvar.UniformGen;
import fr.cemagref.simaqualife.extensions.spatial2D.Grid2D;
import fr.cemagref.simaqualife.kernel.AquaNismsGroup;
import fr.cemagref.simaqualife.kernel.util.TransientParameters.InitTransientParameters;
import fr.cemagref.simaqualife.pilot.Pilot;
public class Grid extends Grid2D<Cell, Individual> { public class Grid extends Grid2D<Cell, Individual> {
...@@ -18,13 +22,83 @@ public class Grid extends Grid2D<Cell, Individual> { ...@@ -18,13 +22,83 @@ public class Grid extends Grid2D<Cell, Individual> {
// TODO Auto-generated constructor stub // TODO Auto-generated constructor stub
} }
private double habitatValue0 = .25;
private double habitatValue1 = .5;
private double habitatValue2 = 1;
//transient private UniformGen uniformGen;
transient private double[] habitatValues;
@InitTransientParameters @InitTransientParameters
public void initTransientParameters(Pilot pilot) { public void initTransientParameters(Pilot pilot) {// throws FileNotFoundException {
// TODO intialisation de chaque maille avec le hsi
// this.pos = neighborsType.getPos();
habitatValues = new double[3];
habitatValues[0] = habitatValue0;
habitatValues[1] = habitatValue1;
habitatValues[2] = habitatValue2;
UniformGen uniformGen = new UniformGen(pilot.getRandomStream(), new UniformDist(0, habitatValues.length - 1));
grid = new Cell[gridWidth * gridHeight];
for (int i = 0; i < grid.length; i++) {
double hab = habitatValues[(int) Math.round(uniformGen.nextDouble())];
grid[i] = new Cell(i, hab);
}
// TODO empty grid /*int cptLigne = 0, idLigne = 0;
this.grid = new Cell[]{new Cell(0, 0.0), new Cell(1, 0.0)}; double hsiStd = 0, hsiMoy = 0;
StringTokenizer sLigne;
// TODO empty grid
this.grid = new Cell[gridWidth * gridHeight];
// TODO intialisation de chaque maille avec le hsi
String filePath = "/PikeLake/data/input/hsi_BROAUTOMNE507.txt";
Scanner scanner = new Scanner(new File(filePath));
// On boucle sur chaque ligne detect
while (scanner.hasNextLine()) {
// Rcupration ligne
String line = scanner.nextLine();
cptLigne = cptLigne + 1;
// Decoupage ligne : id, hsiStd, hsiMoy
sLigne = new StringTokenizer (line);
if (sLigne.hasMoreTokens()) {
idLigne = Integer.parseInt(sLigne.nextToken());
System.out.println(idLigne);
} else if (sLigne.hasMoreTokens()) {
hsiStd = Double.parseDouble(sLigne.nextToken());
System.out.println(hsiStd);
} else if (sLigne.hasMoreTokens()) {
hsiMoy = Double.parseDouble(sLigne.nextToken());
System.out.println(hsiMoy);
}
if (Integer.toString(idLigne) != "Id") {
// Initialisation Grille
if (idLigne == cptLigne) {
grid[cptLigne - 1] = new Cell(cptLigne, hsiMoy);
cptLigne = cptLigne + 1;
} else {
// Si maille hors du shape
while (idLigne != cptLigne) {
grid[cptLigne - 1] = new Cell(cptLigne, -1);
cptLigne = cptLigne + 1;
}
}
}
}
// Remplissage toutes les mailles restantes
while (idLigne != gridWidth * gridHeight) {
grid[cptLigne - 1] = new Cell(cptLigne, -1);
cptLigne = cptLigne + 1;
}
scanner.close();*/
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
......
...@@ -17,6 +17,11 @@ public abstract class Individual extends AquaNism<Cell,Grid> implements Comparab ...@@ -17,6 +17,11 @@ public abstract class Individual extends AquaNism<Cell,Grid> implements Comparab
@Observable(description = "weight (g)") @Observable(description = "weight (g)")
protected double weight; protected double weight;
/**
* <code>sexe</code> Sexe de l'individu (0: Femelle, 1: Male)
*/
protected boolean sexe;
public Individual(Pilot pilot, Cell position) { public Individual(Pilot pilot, Cell position) {
super(pilot, position); super(pilot, position);
this.age = 0; this.age = 0;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment