glaville / mcmas

Download as
Browse Code ยป

Commit 1d0884a7200f260336f613a96ee848e5c8ad7187

Authored by glaville
2 parents e849b630f0 a4185c0f34

Merge branch 'master' of https://disc.univ-fcomte.fr/gitlab/guillaume.laville/mcmas 

Conflicts:
	ivy.xml
	src/mcmas/core/MCMContext.java
	src/mcmas/plugins/axb/AXBPlugin.java
	src/mcmas/plugins/gridsearch/GridSearchPlugin.java
	src/preypredator/PPRuntimeGPU.java
	src/preypredator/PreyPredator2.java
	utils/mcmas/infos.sh

Showing 1 changed file Inline Diff

ivy.xml View file @ 1d0884a
<ivy-module version="2.0"> 1 1 <ivy-module version="2.0">
<info organisation="org.apache" module="geotools"></info> 2 2 <info organisation="org.apache" module="geotools"></info>
<configurations> 3 3 <configurations>
<conf name="default"/> 4 4 <conf name="default"/>
</configurations> 5 5 </configurations>
6 6
<dependencies> 7 7 <dependencies>
<dependency org="org.geotools" name="gt-shapefile-ng" rev="8.6"/> 8 8 <dependency org="org.geotools" name="gt-shapefile-ng" rev="8.6"/>
<dependency org="jfree" name="jfreechart" rev="1.0.13"/> 9 9 <dependency org="jfree" name="jfreechart" rev="1.0.13"/>
<dependency org="org.jocl" name="jocl" rev="0.1.9"/> 10 10 <dependency org="org.jocl" name="jocl" rev="0.1.9"/>
<dependency org="org.slf4j" name="slf4j-api" rev="1.6.6" conf="default->master"/> 11 11 <dependency org="org.slf4j" name="slf4j-api" rev="1.6.6" conf="default->master"/>
<dependency org="org.perf4j" name="perf4j" rev="0.9.16" conf="default->master"/> 12 12 <dependency org="org.perf4j" name="perf4j" rev="0.9.16" conf="default->master"/>
<dependency org="ch.qos.logback" name="logback-core" rev="1.0.7" conf="default->master"/> 13 13 <dependency org="ch.qos.logback" name="logback-core" rev="1.0.7" conf="default->master"/>
<dependency org="ch.qos.logback" name="logback-classic" rev="1.0.7" conf="default->master"/> 14 14 <dependency org="ch.qos.logback" name="logback-classic" rev="1.0.7" conf="default->master"/>
<dependency org="net.sf.jopt-simple" name="jopt-simple" rev="4.3" conf="default->master"/> 15 15 <dependency org="net.sf.jopt-simple" name="jopt-simple" rev="4.3" conf="default->master"/>
<dependency org="it.unimi.dsi" name="fastutil" rev="6.5.15"/> 16 16 <dependency org="it.unimi.dsi" name="fastutil" rev="6.5.15"/>
</dependencies> 17 17 </dependencies>
</ivy-module> 18 18 </ivy-module>