error fixed in format.function.R

abad48e8 · Georges Kunstler · 4642dfe0 · abad48e8
Commit abad48e8 authored 11 years ago by Georges Kunstler
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 5 deletions
+4 -5
--- a/R/format.function.R
+++ b/R/format.function.R
@@ -443,7 +443,7 @@ if(sum(!data.BA.sp[["obs.id"]] == data[["obs.id"]]) >0) stop("competition index
   print(paste("nrow of traits data",nrow(data.traits)))
   list.temp <- list(data.tree=data,data.BA.SP=data.BA.sp,data.traits=data.traits)
   save(list.temp,file=paste("./data/process/list",name.country,ecoregion,"Rdata",sep="."))
- }else{ if(is.data.frame(data.TRY)){
+ }else{ if(is.data.frame(data.TRAITS)){
          data.traits <- fun.extract.format.sp.traits.NOT.TRY(sp=unique(data[["sp"]]),
                         Latin_name=unique(data[["sp.name"]]),
                        data=data.TRAITS,name.match.traits=name.match.traits) 
@@ -453,10 +453,9 @@ if(sum(!data.BA.sp[["obs.id"]] == data[["obs.id"]]) >0) stop("competition index
      }else{
   list.temp <- list(data.tree=data,data.BA.SP=data.BA.sp,data.traits=NA)
   saveRDS(list.temp,file=paste("./data/process/list",name.country,ecoregion,"Rdata",sep="."))
- }
-}
-}
-
+   }
+  }      
+}    

 #######
 #### NEED TO WRITE FUNCTION TO FORMAT DATA FOR BIG TROPICAL PLOT