Commit 1260bbb9 authored by matbuoro's avatar matbuoro
Browse files

Resolved merge conflict

parent 7b7ad6c9
<<<<<<< HEAD
"Year" "Parr 0+" "Smolts" "1SW" "MSW"
1993 10620 NA NA NA
1994 19940 NA 493 55
......@@ -23,3 +24,31 @@
2014 26430 10260 624 123
2015 45760 6589 527 141
2016 20850 9788 498 65
||||||| parent of 9952865... bilan Scorff added
=======
"Year","Parr 0+","Smolts","1SW","MSW"
1993,10620,NA,NA,NA
1994,19940,NA,493,55
1995,10070,6165,662,38
1996,13720,1978,600,64
1997,9148,9968,423,32
1998,6446,4746,510,21
1999,10730,2615,222,60
2000,20380,3165,241,4
2001,3178,11930,296,32
2002,18075,1240,545,20
2003,13610,10130,228,40
2004,24730,7831,1022,54
2005,14300,10760,417,103
2006,15650,7143,814,69
2007,25980,7540,433,83
2008,21840,10540,272,71
2009,17580,13680,255,102
2010,21910,10550,695,61
2011,34160,8783,357,199
2012,32330,8147,333,111
2013,25630,8540,566,94
2014,26430,10260,624,123
2015,45760,6589,527,141
2016,20850,9788,498,65
>>>>>>> 9952865... bilan Scorff added
<<<<<<< HEAD
rm(list=ls()) # Clear memory
year <- 2016
......@@ -51,3 +52,59 @@ table[2:nrow(table),5] <- round(n_MSW,0) # 1995 to now
con <- file(paste('~/Documents/RESEARCH/PROJECTS/ORE/Abundance/',site,"/Bilan_",site,"_",year,'.csv',sep=""), open="wt")
write.table( table, con, row.names = FALSE)
close(con)
||||||| parent of 9952865... bilan Scorff added
=======
rm(list=ls()) # Clear memory
year <- 2016
##________________________SCORFF (starting in 1994)
site <- "Scorff"
setwd(paste("~/Documents/RESEARCH/PROJECTS/ORE/Abundance/",site,"/",sep=""))
years <- seq(1993, year, 1)
table <- array(, dim=c(length(years), 5))
colnames(table) <- c( "Year","Parr 0+","Smolts", "1SW", "MSW")
rownames(table) <- years
smolt.years <- years
table[,1] <- years
## PARR (from 1993 to now on)
stade <- "tacon"
dir <- paste("~/Documents/RESEARCH/PROJECTS/ORE/Abundance/",site,"/",stade,sep="")
if (file.exists(dir)){
load(paste("~/Documents/RESEARCH/PROJECTS/ORE/Abundance/",site,"/",stade,"/results/Results_",stade,"_",year,".RData",sep=""))
n_parr <- fit$median$ntot_Sc
table[,2] <- round(n_parr,0) # 1995 to now
}
## SMOLTS (from 1995 to now on)
stade <- "smolt"
dir <- paste("~/Documents/RESEARCH/PROJECTS/ORE/Abundance/",site,"/",stade,sep="")
if (file.exists(dir)){
load(paste("~/Documents/RESEARCH/PROJECTS/ORE/Abundance/",site,"/",stade,"/results/Results_",stade,"_",year,".RData",sep=""))
n_smolt <- fit$median$Nesc # escapement from river
table[3:nrow(table),3] <- round(n_smolt,0) # 1995 to now
}
## ADULTS (1984 to now)
stade <- "adult"
dir <- paste("~/Documents/RESEARCH/PROJECTS/ORE/Abundance/",site,"/",stade,sep="")
if (file.exists(dir)){
load(paste("~/Documents/RESEARCH/PROJECTS/ORE/Abundance/",site,"/",stade,"/results/Results_",stade,"_",year,".RData",sep=""))
n_1SW <-fit$median$e_1SW # spawners 1SW
n_MSW <- fit$median$e_MSW # spawners MSW
table[2:nrow(table),4] <- round(n_1SW,0) # 1995 to now
table[2:nrow(table),5] <- round(n_MSW,0) # 1995 to now
}
#write.csv(round(table,2), file=paste('~/Documents/RESEARCH/PROJECTS/ORE/Abundance/CIEM/Table9_',site,"_",year,'.csv',sep=""))
con <- file(paste('~/Documents/RESEARCH/PROJECTS/ORE/Abundance/',site,"/Bilan_",site,"_",year,'.csv',sep=""), open="wt")
write.csv( table, con, row.names = FALSE)
close(con)
>>>>>>> 9952865... bilan Scorff added
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