Merge pull request #2 from johnmyleswhite/master

Jonathan Chang · Jonathan Chang · commit 2b13342ac491 · 2013-12-07T19:53:48.000-08:00
Minimal changes to make example work
diff --git a/examples/LDA.jl b/examples/LDA.jl
@@ -1,8 +1,14 @@
-load("TopicModels")
 using TopicModels
 
-testDocuments = readDocuments(open("cora.documents"))
-testLexicon = readLexicon(open("cora.lexicon"))
-model = Model(fill(0.1, 10), 0.01, length(testLexicon), testDocuments)
-trainModel(testDocuments, model, 30)
+exdir = Pkg.dir("TopicModels", "examples")
+
+testDocuments = readDocuments(open(joinpath(exdir, "cora.documents")))
+testLexicon = readLexicon(open(joinpath(exdir, "cora.lexicon")))
+
+corpus = Corpus(testDocuments)
+
+model = Model(fill(0.1, 10), 0.01, length(testLexicon), corpus)
+
+@time trainModel(model, 30)
+
 topWords = topTopicWords(model, testLexicon, 21)
diff --git a/src/TopicModels.jl b/src/TopicModels.jl
@@ -193,6 +193,11 @@ function readLexicon(stream)
   map(chomp, convert(Array{String,1}, lines))
 end
 
-export trainModel, topTopicWords, readDocuments, readLexicon
+export Corpus,
+       Model,
+       readDocuments,
+       readLexicon,
+       topTopicWords,
+       trainModel
 
 end
