Browse code

setwd to original directory at conclusion of loop

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MotifDb@107894 bc3139a8-67e5-0310-9ffc-ced21a209358

p.shannon authored on 28/08/2015 19:16:27
Showing 1 changed files
... ...
@@ -6,10 +6,9 @@ library(org.Sc.sgd.db)
6 6
 # biocLite(c("org.Ce.eg.db", "org.Dm.eg.db", "org.Hs.eg.db", "org.Mm.eg.db", "org.Sc.sgd.db"))
7 7
 
8 8
 directories <- c("flyFactorSurvey", "hPDI", "jaspar", "ScerTF", "stamlab",
9
-                 "uniprobe", "jaspar2014",
9
+                 "uniprobe", "jaspar2014", "jolma2013", "cisbp")
10 10
                  #"HOCOMOCO",
11
-                 "cisbp")
12
-#directories <- directories[2]
11
+
13 12
 starting.directory <- getwd()
14 13
 stopifnot(basename(starting.directory) == "import")
15 14
 
... ...
@@ -26,3 +25,4 @@ for(directory in directories){
26 25
     run(repoRoot)
27 26
     }
28 27
     
28
+setwd(starting.directory)
Browse code

added explicit loads of org packages (eg, library(org.Hs.eg.db)) after collecting them all from the per-source import.R files. with these loaded at the start (and also see commented-out biocLite load.packages command) all of the dependicies of the various import scripts can be installed as you start

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MotifDb@107890 bc3139a8-67e5-0310-9ffc-ced21a209358

p.shannon authored on 28/08/2015 18:58:16
Showing 1 changed files
... ...
@@ -1,3 +1,10 @@
1
+library(org.Ce.eg.db)
2
+library(org.Dm.eg.db)
3
+library(org.Hs.eg.db)
4
+library(org.Mm.eg.db)
5
+library(org.Sc.sgd.db)
6
+# biocLite(c("org.Ce.eg.db", "org.Dm.eg.db", "org.Hs.eg.db", "org.Mm.eg.db", "org.Sc.sgd.db"))
7
+
1 8
 directories <- c("flyFactorSurvey", "hPDI", "jaspar", "ScerTF", "stamlab",
2 9
                  "uniprobe", "jaspar2014",
3 10
                  #"HOCOMOCO",
... ...
@@ -6,8 +13,9 @@ directories <- c("flyFactorSurvey", "hPDI", "jaspar", "ScerTF", "stamlab",
6 13
 starting.directory <- getwd()
7 14
 stopifnot(basename(starting.directory) == "import")
8 15
 
9
-repoRoot <- "~/s/data/public/TFBS"
16
+#repoRoot <- "~/s/data/public/TFBS"
10 17
 #repoRoot <- "/shared/silo_researcher/Morgan_M/BioC/MotifDb"
18
+repoRoot <- "/fh/fast/morgan_m/BioC/MotifDb-raw-data"
11 19
 
12 20
 for(directory in directories){
13 21
     print(noquote(sprintf("--- importing %s", directory)))
Browse code

cisbp now successfully added: unit tets pass, man page for package updated

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MotifDb@107858 bc3139a8-67e5-0310-9ffc-ced21a209358

p.shannon authored on 28/08/2015 04:39:12
Showing 1 changed files
... ...
@@ -1,15 +1,19 @@
1
-directories <- c("flyFactorSurvey", "hPDI", "jaspar", "ScerTF", "stamlab", "uniprobe")
1
+directories <- c("flyFactorSurvey", "hPDI", "jaspar", "ScerTF", "stamlab",
2
+                 "uniprobe", "jaspar2014",
3
+                 #"HOCOMOCO",
4
+                 "cisbp")
5
+#directories <- directories[2]
2 6
 starting.directory <- getwd()
3 7
 stopifnot(basename(starting.directory) == "import")
4 8
 
5
-#repoRoot <- "~/s/data/public/TFBS"
6
-repoRoot <- "/shared/silo_researcher/Morgan_M/BioC/MotifDb"
9
+repoRoot <- "~/s/data/public/TFBS"
10
+#repoRoot <- "/shared/silo_researcher/Morgan_M/BioC/MotifDb"
7 11
 
8 12
 for(directory in directories){
9 13
     print(noquote(sprintf("--- importing %s", directory)))
10 14
     setwd(file.path(starting.directory, directory))
11
-    source("test.R")
12
-    run.tests(repoRoot)
15
+    #source("test.R")
16
+    #run.tests(repoRoot)
13 17
     source("import.R")
14 18
     run(repoRoot)
15 19
     }
Browse code

added and tested uniprobe to the 'importAll' operation

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MotifDb@75475 bc3139a8-67e5-0310-9ffc-ced21a209358

p.shannon authored on 09/04/2013 20:49:43
Showing 1 changed files
... ...
@@ -1,8 +1,8 @@
1
-directories <- c("flyFactorSurvey", "hPDI", "jaspar", "ScerTF", "stamlab")#   "uniprobe"       
1
+directories <- c("flyFactorSurvey", "hPDI", "jaspar", "ScerTF", "stamlab", "uniprobe")
2 2
 starting.directory <- getwd()
3 3
 stopifnot(basename(starting.directory) == "import")
4 4
 
5
-repoRoot <- "~/s/data/public/TFBS"
5
+#repoRoot <- "~/s/data/public/TFBS"
6 6
 repoRoot <- "/shared/silo_researcher/Morgan_M/BioC/MotifDb"
7 7
 
8 8
 for(directory in directories){
Browse code

added repoRoot assignment, only mention in all files

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MotifDb@75384 bc3139a8-67e5-0310-9ffc-ced21a209358

p.shannon authored on 05/04/2013 20:39:49
Showing 1 changed files
... ...
@@ -2,15 +2,15 @@ directories <- c("flyFactorSurvey", "hPDI", "jaspar", "ScerTF", "stamlab")#   "u
2 2
 starting.directory <- getwd()
3 3
 stopifnot(basename(starting.directory) == "import")
4 4
 
5
-kDataDir <- "~/s/data/public/TFBS"
6
-kDataDir <- "/shared/silo_researcher/Morgan_M/BioC/MotifDb"
5
+repoRoot <- "~/s/data/public/TFBS"
6
+repoRoot <- "/shared/silo_researcher/Morgan_M/BioC/MotifDb"
7 7
 
8 8
 for(directory in directories){
9 9
     print(noquote(sprintf("--- importing %s", directory)))
10 10
     setwd(file.path(starting.directory, directory))
11 11
     source("test.R")
12
-    run.tests(kDataDir)
12
+    run.tests(repoRoot)
13 13
     source("import.R")
14
-    run(kDataDir)
14
+    run(repoRoot)
15 15
     }
16 16
     
Browse code

locally appropriate repo root dir, 'kDataDir', passed to run.tests and run

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MotifDb@75370 bc3139a8-67e5-0310-9ffc-ced21a209358

p.shannon authored on 05/04/2013 17:44:42
Showing 1 changed files
... ...
@@ -2,12 +2,15 @@ directories <- c("flyFactorSurvey", "hPDI", "jaspar", "ScerTF", "stamlab")#   "u
2 2
 starting.directory <- getwd()
3 3
 stopifnot(basename(starting.directory) == "import")
4 4
 
5
+kDataDir <- "~/s/data/public/TFBS"
6
+kDataDir <- "/shared/silo_researcher/Morgan_M/BioC/MotifDb"
7
+
5 8
 for(directory in directories){
6 9
     print(noquote(sprintf("--- importing %s", directory)))
7 10
     setwd(file.path(starting.directory, directory))
8
-    #source("test.R")
9
-    #run.tests()
11
+    source("test.R")
12
+    run.tests(kDataDir)
10 13
     source("import.R")
11
-    run()
14
+    run(kDataDir)
12 15
     }
13 16
     
Browse code

disabled automatic testing

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MotifDb@75356 bc3139a8-67e5-0310-9ffc-ced21a209358

p.shannon authored on 05/04/2013 16:50:33
Showing 1 changed files
... ...
@@ -5,8 +5,8 @@ stopifnot(basename(starting.directory) == "import")
5 5
 for(directory in directories){
6 6
     print(noquote(sprintf("--- importing %s", directory)))
7 7
     setwd(file.path(starting.directory, directory))
8
-    source("test.R")
9
-    run.tests()
8
+    #source("test.R")
9
+    #run.tests()
10 10
     source("import.R")
11 11
     run()
12 12
     }
Browse code

first version

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/MotifDb@75353 bc3139a8-67e5-0310-9ffc-ced21a209358

p.shannon authored on 05/04/2013 16:36:14
Showing 1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,13 @@
1
+directories <- c("flyFactorSurvey", "hPDI", "jaspar", "ScerTF", "stamlab")#   "uniprobe"       
2
+starting.directory <- getwd()
3
+stopifnot(basename(starting.directory) == "import")
4
+
5
+for(directory in directories){
6
+    print(noquote(sprintf("--- importing %s", directory)))
7
+    setwd(file.path(starting.directory, directory))
8
+    source("test.R")
9
+    run.tests()
10
+    source("import.R")
11
+    run()
12
+    }
13
+