Updated extractor_loader.py and test.py for the new describe.py

mutalyzer/extractor_loader.py

@@ -23,10 +23,10 @@ def main():
     alt = f.read()
     f.close()
 
-    extracted_allele = describe.describe(ref, alt)
+    extracted_allele = describe.describe_dna(ref, alt)
 
-    print describe.extractor.VERSION
-    print "HGVS: " + describe.allele_description(extracted_allele)
+    print "Description Extractor Version " + describe.extractor.VERSION
+    #print "HGVS: " + describe.allele_description(extracted_allele)
     print "JSON: " + json.dumps({"reference_sequence": ref, "sample_sequence": alt, "allele_description": extracted_allele}, cls=MyEncoder)
 
 #main

mutalyzer/test.py

@@ -12,10 +12,10 @@ def main():
     ref = "ACGTCGATTCGCTAGCTTCGGGGGATAGATAGAGATATAGAGATATTTTT"
     alt = "ACGTCGGTTCGCTAGCTTCGGGGGATAGATAGATATATAGAGATATTTTT"
 
-    extracted_allele = describe.describe(ref, alt)
+    extracted_allele = describe.describe_dna(ref, alt)
 
     print extracted_allele
-    print describe.allele_description(extracted_allele)
+    #print describe.allele_description(extracted_allele)
     print json.dumps({"reference_sequence": ref, "sample_sequence": alt,
         "allele_description": extracted_allele}, cls=MyEncoder)
 #main