Commit b6a14188 authored by Joseph Pallamidessi's avatar Joseph Pallamidessi

Minor aesthetic change to the install script and Makefile. Use a new weierstrass.ez

	modifié:         Makefile
	modifié:         examples/weierstrass/weierstrass.ez
	modifié:         install.sh
parent 4e22301c
...@@ -29,27 +29,27 @@ else ...@@ -29,27 +29,27 @@ else
# You can now install easea into your system or use it from # You can now install easea into your system or use it from
# its current directory. # its current directory.
# #
# Installation: # System Installation (you need admnistration rights):
# To install EASEA into your system, type:
# ". install.sh ".
# EASEA will be installed into /usr/local/easea/ directory, # EASEA will be installed into /usr/local/easea/ directory,
# including, the binary, its libraries and the templates. # including, the binary, its libraries and the templates.
# Finaly, environment variables will be updated (EZ_PATH and PATH), # Finally, environment variables will be updated (EZ_PATH and PATH),
ifeq ($(UNAME),Darwin) ifeq ($(UNAME),Darwin)
# into your .bash_profile file. # into your .bash_profile file.
else else
# into your .bashrc file. # into your .bashrc file.
endif endif
# To install EASEA into your system, type:
# "source install.sh "
# #
# Local Usage: # Local Usage:
# All EASEA elements will stay in the current directory, # All EASEA elements will stay in the current directory,
# but some environment variables need to be updated into your # but some environment variables need to be updated into your
ifeq ($(UNAME),Darwin) ifeq ($(UNAME),Darwin)
# .bash_profile file (EZ_PATH and). To do so type: # .bash_profile file (EZ_PATH). To do so type:
else else
# .bashrc file (EZ_PATH and). To do so type: # .bashrc file (EZ_PATH). To do so type:
endif endif
# ". install.sh local". # "source install.sh local"
# #
# Thanks for using EASEA. # Thanks for using EASEA.
# #
......
...@@ -169,7 +169,7 @@ return NbMut; ...@@ -169,7 +169,7 @@ return NbMut;
\end \end
\Default run parameters : // Please let the parameters appear in this order \Default run parameters : // Please let the parameters appear in this order
Number of generations : 100 // NB_GEN Number of generations : 35 // NB_GEN
Time limit: 0 // In seconds, 0 to deactivate Time limit: 0 // In seconds, 0 to deactivate
Population size : 2048 //POP_SIZE Population size : 2048 //POP_SIZE
Offspring size : 2048 // 40% Offspring size : 2048 // 40%
...@@ -191,7 +191,7 @@ return NbMut; ...@@ -191,7 +191,7 @@ return NbMut;
Generate R script:false Generate R script:false
Plot stats:true //Default: 0 Plot stats:true //Default: 0
Remote island model: true Remote island model: false
IP file: ip.txt //File containing all the remote island's IP IP file: ip.txt //File containing all the remote island's IP
Server port : 2929 Server port : 2929
Migration probability: 0.33 Migration probability: 0.33
......
...@@ -26,6 +26,8 @@ if [ "$1" = "local" ]; then ...@@ -26,6 +26,8 @@ if [ "$1" = "local" ]; then
echo "Exporting and setting environment variables" echo "Exporting and setting environment variables"
export EZ_PATH="$PWD/" export EZ_PATH="$PWD/"
export PATH="$PATH:$PWD/bin" export PATH="$PATH:$PWD/bin"
echo >> $PROFILE
echo "# EASEA paths for compiler and library">> $PROFILE
echo "export EZ_PATH=$EZ_PATH">>$PROFILE echo "export EZ_PATH=$EZ_PATH">>$PROFILE
echo "export PATH=\$PATH:$PWD/bin" >>$PROFILE echo "export PATH=\$PATH:$PWD/bin" >>$PROFILE
...@@ -36,6 +38,8 @@ else ...@@ -36,6 +38,8 @@ else
echo "Exporting and setting environment variables" echo "Exporting and setting environment variables"
export EZ_PATH="/usr/local/easea/" export EZ_PATH="/usr/local/easea/"
export PATH="$PATH:/usr/local/easea/bin" export PATH="$PATH:/usr/local/easea/bin"
echo >> $PROFILE
echo "# EASEA paths for compiler and library">> $PROFILE
echo "export EZ_PATH=$EZ_PATH">>$PROFILE echo "export EZ_PATH=$EZ_PATH">>$PROFILE
echo "export PATH=\$PATH:/usr/local/easea/bin" >>$PROFILE echo "export PATH=\$PATH:/usr/local/easea/bin" >>$PROFILE
......
Markdown is supported
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