--- a/ks_distribution.R	Tue Jun 27 08:16:54 2017 -0400
+++ b/ks_distribution.R	Tue Jun 27 09:02:48 2017 -0400
@@ -15,34 +15,39 @@
 opt <- args$options
 
 set_component_colors = function(colors, number_comp)
-{
+{   
     # Handle colors for components.
-    if (is.null(colors)) {
+    if (is.na(colors)) {
         # Randomly specify colors for components.
-        component_colors <- c('red', 'yellow', 'green', 'black', 'blue', 'darkorange')
+        component_colors <- c("red", "yellow", "green", "black", "blue", "darkorange")
     } else {
         # Handle selected colors for components.
         component_colors <- c()
-        colors <- as.character(colors)
-        items <- strsplit(colors, ",")
-        for (item in items) {
+        colors <- as.character(colors) 
+        items <- strsplit(colors, ",") 
+        for (item in items) { 
             component_colors <- c(component_colors, item)
         }
         num_colors_specified <- length(component_colors)
         if (num_colors_specified < number_comp) {
-            for (i in num_colors_specified:number_comp) {
-                if (!('red' %in% names(component_colors))) {
-                    component_colors <- c(component_colors, 'red')
-                } else if (!('yellow' %in% names(component_colors))) {
-                    component_colors <- c(component_colors, 'yellow')
-                } else if (!('green' %in% names(component_colors))) {
-                    component_colors <- c(component_colors, 'green')
-                } else if (!('black' %in% names(component_colors))) {
-                    component_colors <- c(component_colors, 'black')
-                } else if (!('blue' %in% names(component_colors))) {
-                    component_colors <- c(component_colors, 'blue')
-                } else {
-                    component_colors <- c(component_colors, 'darkorange')
+            # The number of selected colors is less than the number of
+            # components, so we'll add random colors that were not
+            # selected to the set of component colors until we have a
+            # color for each component.
+            loop_count <- number_comp - num_colors_specified
+            for (i in 1:loop_count) {
+                if (!(is.element("red", component_colors))) {
+                    component_colors <- c(component_colors, "red")
+                } else if (!(is.element("yellow", component_colors))) {
+                    component_colors <- c(component_colors, "yellow")
+                } else if (!(is.element("green", component_colors))) {
+                    component_colors <- c(component_colors, "green")
+                } else if (!(is.element("black", component_colors))) {
+                    component_colors <- c(component_colors, "black")
+                } else if (!(is.element("blue", component_colors))) {
+                    component_colors <- c(component_colors, "blue")
+                } else if (!(is.element("darkorange", component_colors))) {
+                    component_colors <- c(component_colors, "darkorange")
                 }
             }
         }
@@ -140,29 +145,29 @@
 # Set pi, mu, var.
 items <- get_pi_mu_var(components_data, number_comp)
 if (number_comp == 1) {
-	pi <- items[1]
-	mu <- items[2]
-	var <- items[3]
+    pi <- items[1]
+    mu <- items[2]
+    var <- items[3]
 } else if (number_comp == 2) {
-	pi <- items[1:2]
-	mu <- items[3:4]
-	var <- items[5:6]
+    pi <- items[1:2]
+    mu <- items[3:4]
+    var <- items[5:6]
 } else if (number_comp == 3) {
-	pi <- items[1:3]
-	mu <- items[4:6]
-	var <- items[7:9]
+    pi <- items[1:3]
+    mu <- items[4:6]
+    var <- items[7:9]
 } else if (number_comp == 4) {
-	pi <- items[1:4]
-	mu <- items[5:8]
-	var <- items[9:12]
+    pi <- items[1:4]
+    mu <- items[5:8]
+    var <- items[9:12]
 } else if (number_comp == 5) {
-	pi <- items[1:5]
-	mu <- items[6:10]
-	var <- items[11:15]
+    pi <- items[1:5]
+    mu <- items[6:10]
+    var <- items[11:15]
 } else if (number_comp == 6) {
-	pi <- items[1:6]
-	mu <- items[7:12]
-	var <- items[13:18]
+    pi <- items[1:6]
+    mu <- items[7:12]
+    var <- items[13:18]
 }
 
 # Plot the output.