claude-evolve 1.2.10 → 1.2.12

package/bin/claude-evolve-analyze

@@ -11,7 +11,7 @@ load_config
 # Parse arguments
 open_chart=false
 csv_file="$FULL_CSV_PATH"
-output_file="$FULL_OUTPUT_DIR/performance.png"
+output_file=""  # Will be set later if not specified
 
 while [[ $# -gt 0 ]]; do
   case $1 in
@@ -53,6 +53,17 @@ EOF
   esac
 done
 
+# Set default output file if not specified
+if [[ -z "$output_file" ]]; then
+  if [[ -d "$FULL_OUTPUT_DIR" ]]; then
+    # We're in an evolution workspace
+    output_file="$FULL_OUTPUT_DIR/performance.png"
+  else
+    # Not in workspace, use temp file
+    output_file="/tmp/claude_evolve_performance_$$.png"
+  fi
+fi
+
 # Check if CSV exists
 if [[ ! -f $csv_file ]]; then
   echo "[ERROR] CSV file not found: $csv_file" >&2
@@ -163,15 +174,21 @@ while IFS=, read -r id _ desc perf status; do
 done <"$csv_file"
 
 # Process generation stats
-for gen in $(cut -d' ' -f1 "$gen_stats_file" | sort -u); do
-  total_in_gen=$(grep -c "^$gen " "$gen_stats_file")
-  completed_in_gen=$(grep -c "^$gen completed" "$gen_stats_file")
+for gen in $(cut -d' ' -f1 "$gen_stats_file" | sort -u || echo ""); do
+  [[ -z "$gen" ]] && continue
+  total_in_gen=$(grep -c "^$gen " "$gen_stats_file" 2>/dev/null || echo "0")
+  completed_in_gen=$(grep -c "^$gen completed" "$gen_stats_file" 2>/dev/null || echo "0")
+  # Clean any whitespace from the numbers
+  completed_in_gen=$(echo "$completed_in_gen" | tr -d '[:space:]')
   
   echo -n "$gen: $total_in_gen candidates"
   
-  if [[ $completed_in_gen -gt 0 ]]; then
-    # Calculate average performance for this generation
-    sum=$(grep "^$gen completed" "$gen_stats_file" | awk '{s+=$3} END {print s}')
+  if [[ "$completed_in_gen" -gt 0 ]]; then
+    # Calculate average performance for this generation  
+    sum="0"
+    if grep -q "^$gen completed" "$gen_stats_file"; then
+      sum=$(grep "^$gen completed" "$gen_stats_file" | awk '{s+=$3} END {printf "%.6f", s}' 2>/dev/null || echo "0")
+    fi
     avg=$(echo "scale=4; $sum / $completed_in_gen" | bc -l 2>/dev/null || echo "0")
     echo " ($completed_in_gen completed, avg: $avg)"
   else
@@ -181,16 +198,52 @@ done
 
 rm -f "$gen_stats_file"
 
+# Count valid performance entries for chart (excluding zeros)
+valid_performance_count=0
+while IFS=, read -r id _ desc perf status; do
+  [[ $id == "id" ]] && continue # Skip header
+  if [[ $status =~ ^(complete|completed)$ && -n $perf && $perf != "" ]]; then
+    if (( $(echo "$perf > 0" | bc -l 2>/dev/null || echo "0") )); then
+      ((valid_performance_count++))
+    fi
+  fi
+done <"$csv_file"
+
 # Simple chart generation using gnuplot if available
-if command -v gnuplot >/dev/null 2>&1 && [[ $count_with_performance -gt 0 ]]; then
+if command -v gnuplot >/dev/null 2>&1 && [[ $valid_performance_count -gt 0 ]]; then
   echo
   echo "Generating performance chart: $output_file"
 
-  # Create data file for gnuplot with row numbers, excluding zeros
+  # Create data files for gnuplot
   data_file="/tmp/evolution_data_$$.dat"
   winner_file="/tmp/evolution_winner_$$.dat"
-  echo "# Row ID Performance" >"$data_file"
-
+  gen_avg_file="/tmp/evolution_gen_avg_$$.dat"
+  
+  echo "# Row ID Performance Generation" >"$data_file"
+  echo "# Generation AvgPerformance Color" >"$gen_avg_file"
+
+  # Get color by generation number
+  get_gen_color() {
+    local gen_num="$1"
+    case $gen_num in
+      1) echo "#1f77b4" ;;  # blue
+      2) echo "#ff7f0e" ;;  # orange  
+      3) echo "#2ca02c" ;;  # green
+      4) echo "#d62728" ;;  # red
+      5) echo "#9467bd" ;;  # purple
+      6) echo "#8c564b" ;;  # brown
+      7) echo "#e377c2" ;;  # pink
+      8) echo "#7f7f7f" ;;  # gray
+      9) echo "#bcbd22" ;;  # olive
+      10) echo "#17becf" ;; # cyan
+      *) echo "#cccccc" ;;  # default gray
+    esac
+  }
+
+  # Create temporary files for generation tracking
+  gen_data_temp="/tmp/evolution_gen_temp_$$.dat"
+  >"$gen_data_temp"
+  
   row_num=0
   max_perf=0
   max_row=0
@@ -200,11 +253,26 @@ if command -v gnuplot >/dev/null 2>&1 && [[ $count_with_performance -gt 0 ]]; th
     [[ $id == "id" ]] && continue # Skip header
     ((row_num++))
     
+    # Extract generation from ID
+    gen="gen01" # default
+    if [[ $id =~ ^(gen[0-9]+)- ]]; then
+      gen="${BASH_REMATCH[1]}"
+    fi
+    
     # Only include completed algorithms with non-zero performance
     if [[ -n $perf && $perf != "" && $status =~ ^(complete|completed)$ ]]; then
       # Skip zero values (they're errors)
       if (( $(echo "$perf > 0" | bc -l) )); then
-        echo "$row_num \"$id\" $perf" >>"$data_file"
+        # Assign generation number for coloring (1-based)
+        gen_num=1
+        if [[ $id =~ ^gen([0-9]+)- ]]; then
+          gen_num=$((10#${BASH_REMATCH[1]}))
+        fi
+        
+        echo "$row_num \"$id\" $perf $gen_num" >>"$data_file"
+        
+        # Track for generation averages
+        echo "$gen $perf" >>"$gen_data_temp"
         
         # Track the winner
         if (( $(echo "$perf > $max_perf" | bc -l) )); then
@@ -216,35 +284,80 @@ if command -v gnuplot >/dev/null 2>&1 && [[ $count_with_performance -gt 0 ]]; th
     fi
   done <"$csv_file"
 
+  # Create generation averages file
+  gen_index=1
+  for gen in $(cut -d' ' -f1 "$gen_data_temp" | sort -u); do
+    if grep -q "^$gen " "$gen_data_temp"; then
+      # Calculate average for this generation
+      sum=$(grep "^$gen " "$gen_data_temp" | awk '{s+=$2} END {printf "%.6f", s}' 2>/dev/null || echo "0")
+      count=$(grep -c "^$gen " "$gen_data_temp")
+      if [[ $count -gt 0 ]]; then
+        avg=$(echo "scale=4; $sum / $count" | bc -l 2>/dev/null || echo "0")
+        gen_num=$(echo "$gen" | sed 's/gen0*//')
+        color=$(get_gen_color "$gen_num")
+        echo "$gen_index \"$gen\" $avg \"$color\"" >>"$gen_avg_file"
+        ((gen_index++))
+      fi
+    fi
+  done
+
   # Create winner data point
   if [[ -n $max_id ]]; then
     echo "$max_row \"$max_id\" $max_perf" >"$winner_file"
   fi
 
-  # Generate plot
-  gnuplot <<EOF
-set terminal png size 1000,600
+  # Generate dual plot
+  if [[ -s "$data_file" ]]; then
+    gnuplot <<EOF
+set terminal png size 1200,800
 set output "$output_file"
-set title "Algorithm Evolution Performance"
+
+# Set up multiplot with proper spacing
+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 ylabel "Performance Score"
 set grid
-set key off
-
-# Set y-axis range with some padding
-stats "$data_file" using 3 nooutput
-set yrange [STATS_min*0.95:STATS_max*1.05]
-
-# Plot the main line in dark blue, winner as large blue circle
-plot "$data_file" using 1:3 with lines linewidth 2 linecolor rgb "#1f77b4" notitle, \
-     "$data_file" using 1:3 with points pointtype 7 pointsize 0.5 linecolor rgb "#1f77b4" notitle, \
-     "$winner_file" using 1:3 with points pointtype 7 pointsize 3 linecolor rgb "#0000ff" notitle
-
-# Add label with winner info at bottom
-set label 1 "Best: $max_id (Score: $max_perf)" at graph 0.5, -0.15 center font ",10"
+set key outside right
+
+# Define colors for generations
+plot "$data_file" using (\$4==1?\$1:1/0):3 with linespoints linewidth 2 linecolor rgb "#1f77b4" pointsize 0.8 title "Gen 1", \\
+     "$data_file" using (\$4==2?\$1:1/0):3 with linespoints linewidth 2 linecolor rgb "#ff7f0e" pointsize 0.8 title "Gen 2", \\
+     "$data_file" using (\$4==3?\$1:1/0):3 with linespoints linewidth 2 linecolor rgb "#2ca02c" pointsize 0.8 title "Gen 3", \\
+     "$data_file" using (\$4==4?\$1:1/0):3 with linespoints linewidth 2 linecolor rgb "#d62728" pointsize 0.8 title "Gen 4", \\
+     "$data_file" using (\$4==5?\$1:1/0):3 with linespoints linewidth 2 linecolor rgb "#9467bd" pointsize 0.8 title "Gen 5", \\
+     "$winner_file" using 1:3 with points pointtype 7 pointsize 4 linecolor rgb "#000000" title "Winner"
+
+#=================== BOTTOM PLOT: Generation Averages ===================
+set title "Average Performance by Generation" font ",14"
+set xlabel "Generation"
+set ylabel "Avg Performance"
+set style fill solid 0.8
+set boxwidth 0.6
+unset key
+set grid y
+
+# Set custom x-axis labels
+set xtics ("Gen1" 1, "Gen2" 2, "Gen3" 3, "Gen4" 4, "Gen5" 5)
+
+plot "$gen_avg_file" using 1:3 with boxes linecolor rgb "#4CAF50" notitle
+
+unset multiplot
+
+# Add winner label at bottom
+set terminal png size 1200,830
+set output "$output_file"
+set label "Best Overall: $max_id (Score: $max_perf)" at screen 0.5, 0.05 center font ",12"
+replot
 EOF
+  else
+    echo "[WARN] No valid performance data to plot"
+    exit 0
+  fi
 
-  rm -f "$data_file" "$winner_file"
+  rm -f "$data_file" "$winner_file" "$gen_avg_file" "$gen_data_temp"
   echo "Chart saved to: $output_file"
 
   # Always try to open chart (not just when --open is used)
@@ -258,9 +371,9 @@ EOF
     echo "[WARN] Cannot open chart automatically. View: $output_file"
   fi
 else
-  if [[ $count_with_performance -eq 0 ]]; then
+  if [[ $valid_performance_count -eq 0 ]]; then
     echo
-    echo "No performance data available for chart generation."
+    echo "No valid performance data available for chart generation."
     echo "Run 'claude-evolve run' to execute candidates first."
   else
     echo

package/package.json

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