Changeset 620 for mds-and-trees

Timestamp:

09/30/16 02:43:38 (8 years ago)

Author:

konrad

Message:

The parameters should not be case specific anymore, also added some protection against wrong values of parameters and marked the default values.

File:

• mds-and-trees/tree-genealogy.py (modified) (3 diffs)

mds-and-trees/tree-genealogy.py

@@ -418 +418 @@
 
     #TODO: better names for those parameters
-    parser.add_argument('-t', '--time', default='GENERATIONAL', dest='time', help='values on vertical axis (BIRTHS/GENERATIONAL/REAL); '
+    parser.add_argument('-t', '--time', default='GENERATIONAL', dest='time', help='values on vertical axis (BIRTHS/GENERATIONAL(d)/REAL); '
                                                                       'BIRTHS: time measured as the number of births since the beginning; '
                                                                       'GENERATIONAL: time measured as number of ancestors; '
                                                                       'REAL: real time of the simulation')
-    parser.add_argument('-b', '--balance', default='DENSITY', dest='balance', help='method of placing nodes in the tree (RANDOM/MIN/DENSITY)')
-    parser.add_argument('-s', '--scale', default='NONE', dest='scale', help='type of timescale added to the tree (NONE/SIMPLE)')
-    parser.add_argument('-c', '--coloring', default='IMPORTANCE', dest="coloring", help='method of coloring the tree (NONE/IMPORTANCE/TYPE)')
-    parser.add_argument('-d', '--dots', default='TYPE', dest='dots', help='method of drawing dots (individuals) (NONE/NORMAL/TYPE)')
+    parser.add_argument('-b', '--balance', default='DENSITY', dest='balance', help='method of placing nodes in the tree (RANDOM/MIN/DENSITY(d))')
+    parser.add_argument('-s', '--scale', default='NONE', dest='scale', help='type of timescale added to the tree (NONE(d)/SIMPLE)')
+    parser.add_argument('-c', '--coloring', default='IMPORTANCE', dest="coloring", help='method of coloring the tree (NONE/IMPORTANCE(d)/TYPE)')
+    parser.add_argument('-d', '--dots', default='TYPE', dest='dots', help='method of drawing dots (individuals) (NONE/NORMAL/TYPE(d))')
     parser.add_argument('-j', '--jitter', dest="jitter", action='store_true', help='draw horizontal positions of children from the normal distribution')
 
@@ -444 +444 @@
     args = parser.parse_args()
 
-    TIME = args.time
-    BALANCE = args.balance
-    DOT_STYLE = args.dots
-    COLORING = args.coloring
+    TIME = args.time.upper()
+    BALANCE = args.balance.upper()
+    DOT_STYLE = args.dots.upper()
+    COLORING = args.coloring.upper()
+    SCALE = args.scale.upper()
     JITTER = args.jitter
+    if not TIME in ['BIRTHS', 'GENERATIONAL', 'REAL']\
+        or not BALANCE in ['RANDOM', 'MIN', 'DENSITY']\
+        or not DOT_STYLE in ['NONE', 'NORMAL', 'TYPE']\
+        or not COLORING in ['NONE', 'IMPORTANCE', 'TYPE']\
+        or not SCALE in ['NONE', 'SIMPLE']:
+        print("Incorrect value of one of the parameters! Closing the program.") #TODO don't be lazy, figure out which parameter is wrong...
+        return
+
 
     svg_mutation_line_style += hex_to_style(args.color_mut)
@@ -481 +490 @@
         draw_spine()
 
-    draw_scale(dir, args.scale)
+    draw_scale(dir, SCALE)
 
     svg_file.write("</svg>")