claude-evolve 1.3.14 → 1.3.15

package/bin/claude-evolve-analyze

@@ -295,13 +295,13 @@ if command -v gnuplot >/dev/null 2>&1 && [[ $valid_performance_count -gt 0 ]]; t
   # Get color by generation number (rotates through 5 colors)
   get_gen_color() {
     local gen_num="$1"
-    local color_index=$(( (gen_num - 1) % 5 + 1 ))
+    local color_index=$(( gen_num % 5 + 1 ))
     case $color_index in
       1) echo "#1f77b4" ;;  # blue
       2) echo "#ff7f0e" ;;  # orange  
       3) echo "#2ca02c" ;;  # green
       4) echo "#d62728" ;;  # red
-      5) echo "#9467bd" ;;  # purple
+      0) echo "#9467bd" ;;  # purple
     esac
   }
 
@@ -314,76 +314,101 @@ if command -v gnuplot >/dev/null 2>&1 && [[ $valid_performance_count -gt 0 ]]; t
   max_row=0
   max_id=""
   
-  # Use Python to generate chart data and capture output
-  python_output=$("$PYTHON_CMD" -c "
+  # Use Python to generate chart data
+  "$PYTHON_CMD" -c "
 import csv
 import re
 
-row_num = 0
-max_perf = 0
-max_row = 0
-max_id = ''
-
 with open('$csv_file', 'r') as f:
     reader = csv.reader(f)
     next(reader)  # Skip header
     
-    data_lines = []
-    gen_temp_lines = []
+    completed_order = 0  # Track order of completion
+    
+    with open('$data_file', 'w') as data_f:
+        data_f.write('# Order ID Performance Generation\\n')
+        
+    with open('$gen_data_temp', 'w') as gen_f:
+        pass  # Clear file
+    
+    max_perf = 0
+    max_id = ''
+    max_order = 0
     
     for row in reader:
         if len(row) < 5:
             continue
             
-        row_num += 1
         id, _, desc, perf, status = row[:5]
         
         # Extract generation from ID
         gen = 'gen01'  # default
-        match = re.match(r'^(gen[0-9]+)-', id)
+        gen_num = 1
+        match = re.match(r'^gen([0-9]+)-', id)
         if match:
-            gen = match.group(1)
+            gen = f'gen{match.group(1)}'
+            gen_num = int(match.group(1))
         
         # Only include completed algorithms with non-zero performance
         if perf and perf != '' and status in ['complete', 'completed']:
             try:
                 perf_val = float(perf)
                 if perf_val > 0:
-                    # Assign generation number for coloring (1-based)
-                    gen_num = 1
-                    match = re.match(r'^gen([0-9]+)-', id)
-                    if match:
-                        gen_num = int(match.group(1))
+                    completed_order += 1
+                    
+                    # Write to data file
+                    with open('$data_file', 'a') as f:
+                        f.write(f'{completed_order} \"{id}\" {perf} {gen_num}\\n')
                     
-                    data_lines.append(f'{row_num} \\\"{id}\\\" {perf} {gen_num}')
-                    gen_temp_lines.append(f'{gen} {perf}')
+                    # Write to gen temp file
+                    with open('$gen_data_temp', 'a') as f:
+                        f.write(f'{gen} {perf}\\n')
                     
                     # Track the winner
                     if perf_val > max_perf:
                         max_perf = perf_val
-                        max_row = row_num
+                        max_order = completed_order
                         max_id = id
             except ValueError:
                 pass
 
-# Write data file
-with open('$data_file', 'a') as f:
-    for line in data_lines:
-        f.write(line + '\\\\n')
-
-# Write gen temp file
-with open('$gen_data_temp', 'a') as f:
-    for line in gen_temp_lines:
-        f.write(line + '\\\\n')
-
 # Output max values for shell
 print(f'max_perf={max_perf}')
-print(f'max_row={max_row}')
-print(f'max_id=\\\"{max_id}\\\"')
-")
+print(f'max_row={max_order}')
+print(f'max_id=\"{max_id}\"')
+"
   
-  # Evaluate the Python output
-  eval "$python_output"
+  # Capture the output properly
+  eval "$("$PYTHON_CMD" -c "
+import csv
+import re
+
+with open('$csv_file', 'r') as f:
+    reader = csv.reader(f)
+    next(reader)
+    
+    max_perf = 0
+    max_id = ''
+    max_order = 0
+    completed_order = 0
+    
+    for row in reader:
+        if len(row) >= 5 and row[3] and row[4] in ['complete', 'completed']:
+            try:
+                perf_val = float(row[3])
+                if perf_val > 0:
+                    completed_order += 1
+                    if perf_val > max_perf:
+                        max_perf = perf_val
+                        max_order = completed_order
+                        max_id = row[0]
+            except ValueError:
+                pass
+
+print(f'max_perf={max_perf}')
+print(f'max_row={max_order}')
+print(f'max_id=\"{max_id}\"')
+")"
 
   # Create generation averages file and track max generation
   gen_index=1
@@ -397,7 +422,7 @@ print(f'max_id=\\\"{max_id}\\\"')
         avg=$(echo "scale=4; $sum / $count" | bc -l 2>/dev/null || echo "0")
         gen_num=$(echo "$gen" | sed 's/gen0*//')
         # Track max generation number
-        if [[ $gen_num -gt $max_gen_num ]]; then
+        if [[ $gen_num =~ ^[0-9]+$ ]] && [[ $gen_num -gt $max_gen_num ]]; then
           max_gen_num=$gen_num
         fi
         color=$(get_gen_color "$gen_num")
@@ -417,18 +442,45 @@ print(f'max_id=\\\"{max_id}\\\"')
 
   # Generate dual plot
   if [[ -s "$data_file" ]]; then
-    # Build dynamic plot command for generations
+    # Debug: show data file content
+    # echo "DEBUG: Data file content:"
+    # cat "$data_file"
+    # echo "DEBUG: max_gen_num=$max_gen_num"
+    
+    # Plot all algorithms in order of completion, colored by generation
     plot_cmd=""
-    for ((i=1; i<=max_gen_num; i++)); do
-      color=$(get_gen_color "$i")
-      if [[ -n $plot_cmd ]]; then
-        plot_cmd="$plot_cmd, \\"$'\n'
+    gen_plots_added=0
+    
+    # Find all generations that have data
+    generations=($(awk '{if(NR>1) print $4}' "$data_file" | sort -n | uniq))
+    
+    for gen_num in "${generations[@]}"; do
+      if [[ -n $gen_num ]]; then
+        color=$(get_gen_color "$gen_num")
+        if [[ $gen_plots_added -gt 0 ]]; then
+          plot_cmd="$plot_cmd, \\"$'\n'
+        fi
+        plot_cmd="${plot_cmd}     \"$data_file\" using (\$4==$gen_num?\$1:1/0):3 with linespoints linewidth 2 linecolor rgb \"$color\" pointsize 1.2 title \"Gen $gen_num\""
+        ((gen_plots_added++))
       fi
-      plot_cmd="${plot_cmd}     \"$data_file\" using (\$4==$i?\$1:1/0):3 with linespoints linewidth 2 linecolor rgb \"$color\" pointsize 0.8 title \"Gen $i\""
     done
+    
     # Add winner point
-    plot_cmd="$plot_cmd, \\"$'\n'
-    plot_cmd="${plot_cmd}     \"$winner_file\" using 1:3 with points pointtype 7 pointsize 2 linecolor rgb \"#0066cc\" title \"Winner\""
+    if [[ -n $max_id && -s "$winner_file" ]]; then
+      if [[ $gen_plots_added -gt 0 ]]; then
+        plot_cmd="$plot_cmd, \\"$'\n'
+      fi
+      plot_cmd="${plot_cmd}     \"$winner_file\" using 1:3 with points pointtype 7 pointsize 3 linecolor rgb \"gold\" title \"Best ($max_id)\""
+    fi
+    
+    # Fallback if no generation-specific plots
+    if [[ $gen_plots_added -eq 0 ]]; then
+      plot_cmd="\"$data_file\" using 1:3 with linespoints linewidth 2 linecolor rgb \"#1f77b4\" pointsize 1.2 title \"Evolution Progress\""
+      if [[ -n $max_id && -s "$winner_file" ]]; then
+        plot_cmd="$plot_cmd, \\"$'\n'
+        plot_cmd="${plot_cmd}     \"$winner_file\" using 1:3 with points pointtype 7 pointsize 3 linecolor rgb \"gold\" title \"Best ($max_id)\""
+      fi
+    fi
     
     # Build x-axis labels for generation chart
     xtics_labels=""
@@ -448,11 +500,12 @@ set multiplot layout 2,1 margins 0.08,0.82,0.15,0.95 spacing 0.1,0.15
 
 #=================== TOP PLOT: Performance Over Time ===================
 set title "Algorithm Evolution Performance Over Time" font ",14"
-set xlabel "Evolution Run"
+set xlabel "Completion Order (Algorithm #)"
 set ylabel "Performance Score"
 set grid
 set key outside right
-set xtics auto
+set xtics 1
+set autoscale y
 
 # Define colors for generations
 plot $plot_cmd

package/bin/claude-evolve-run-parallel

@@ -71,7 +71,10 @@ reader = csv.reader(sys.stdin)
 next(reader)  # Skip header
 count = 0
 for row in reader:
-    if len(row) >= 5 and (row[4] == 'pending' or row[4] == ''):
+    # If row has fewer than 5 fields, treat as pending
+    if len(row) < 5:
+        count += 1
+    elif len(row) >= 5 and (row[4] == 'pending' or row[4] == ''):
         count += 1
 print(count)
 "

package/lib/csv-lock.sh

@@ -162,7 +162,15 @@ with open('$csv_file', 'r') as f:
 # Find first pending candidate
 candidate_id = None
 for i in range(1, len(rows)):
-    if len(rows[i]) >= 5 and (rows[i][4] == 'pending' or rows[i][4] == ''):
+    # If row has fewer than 5 fields, it's pending
+    if len(rows[i]) < 5:
+        candidate_id = rows[i][0]
+        # Ensure row has 5 fields before setting status
+        while len(rows[i]) < 5:
+            rows[i].append('')
+        rows[i][4] = 'running'  # Update status
+        break
+    elif len(rows[i]) >= 5 and (rows[i][4] == 'pending' or rows[i][4] == ''):
         candidate_id = rows[i][0]
         rows[i][4] = 'running'  # Update status
         break

package/lib/csv_helper.py

@@ -12,7 +12,11 @@ def find_pending_row(csv_path):
         reader = csv.reader(f)
         next(reader)  # Skip header
         for row_num, row in enumerate(reader, start=2):
-            # Ensure row has at least 5 fields
+            # If row has fewer than 5 fields, it's pending
+            if len(row) < 5:
+                return row_num
+            
+            # Ensure row has at least 5 fields for status check
             while len(row) < 5:
                 row.append('')
             

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-evolve",
-  "version": "1.3.14",
+  "version": "1.3.15",
   "bin": {
     "claude-evolve": "./bin/claude-evolve",
     "claude-evolve-main": "./bin/claude-evolve-main",