Merge branch 'master' of github.com:hng/BiomolecularStructures

hng · Mar 26, 2015 · 80ec377 · 80ec377
2 parents 62766bd + b886079
commit 80ec377
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/BiomolecularStructures.jl b/src/BiomolecularStructures.jl
@@ -5,5 +5,6 @@ module BiomolecularStructures
 	include(Pkg.dir("BiomolecularStructures", "src/PLOT/", "plot.jl"))	
 	include(Pkg.dir("BiomolecularStructures", "src/WebBLAST/", "hit.jl"))	
 	include(Pkg.dir("BiomolecularStructures", "src/WebBLAST/", "WebBLAST.jl"))	
+	include(Pkg.dir("BiomolecularStructures", "src/MODELLER/", "modeller.jl"))	
 	include(Pkg.dir("BiomolecularStructures", "src/MAFFT/", "mafft.jl"))	
 end
diff --git a/src/MODELLER/modeller.jl b/src/MODELLER/modeller.jl
@@ -35,11 +35,11 @@ export model_single, gen_script, evaluate_model
         a[:make]()
     end
 
-    function evaluate_model(pdbfile::String; outputfile::String)
+    function evaluate_model(pdbfile::String, outputfile::String = "")
 
         # check for optional argument output and set it to the first part of the name of the PDB file
-        if !isdefined(:outputfile)
-            outputfile = string(split(a,".")[1], ".profile")
+        if outputfile == ""
+            outputfile = string(split(pdbfile,".")[1], ".profile")
         end
 
         @pyimport modeller