wip

Author: acharneski

src/analysis/mod.rs

@@ -8,79 +8,6 @@
 
 #[cfg(feature = "plotting")]
 pub mod plotting;
-pub mod reporting;
-pub mod statistics;
-
-// Re-export commonly used types
-
-use crate::benchmarks::evaluation::BenchmarkResults;
-use crate::optimizers::OptResult;
-#[cfg(feature = "plotting")]
-pub use plotting::{ExtendedOptimizationTrace, PlotConfig, PlottingEngine};
-pub use reporting::{AcademicReport, CSVExporter, LaTeXExporter};
-pub use statistics::{
-    ConvergenceComparison, EffectSize, PerformanceProfiles, RobustnessAnalysis, SignificanceTest,
-    StatisticalAnalysis,
-};
-
-/// Generate comprehensive analysis report
-pub fn generate_full_analysis(results: &BenchmarkResults) -> OptResult<AnalysisReport> {
-    let stats = StatisticalAnalysis::new(results);
-    let convergence = stats.convergence_comparison().clone();
-    let performance = stats.performance_profiles().clone();
-    let robustness = stats.robustness_analysis().clone();
-
-    Ok(AnalysisReport {
-        convergence_comparison: convergence,
-        performance_profiles: performance,
-        robustness_analysis: robustness,
-        statistical_tests: stats.significance_tests().clone(),
-        effect_sizes: stats.effect_sizes(),
-    })
-}
-
-/// Complete analysis report structure
-#[derive(Debug, Clone)]
-pub struct AnalysisReport {
-    pub convergence_comparison: ConvergenceComparison,
-    pub performance_profiles: PerformanceProfiles,
-    pub robustness_analysis: RobustnessAnalysis,
-    pub statistical_tests: Vec<SignificanceTest>,
-    pub effect_sizes: Vec<EffectSize>,
-}
-
-impl AnalysisReport {
-    /// Export to LaTeX format for academic papers
-    pub fn to_latex(&self) -> OptResult<String> {
-        let exporter = LaTeXExporter::new();
-        exporter.export_report(self)
-    }
-
-    /// Export to CSV for further analysis
-    pub fn to_csv(&self, output_dir: &std::path::Path) -> OptResult<()> {
-        let exporter = CSVExporter::new();
-        exporter.export_report(self, output_dir)
-    }
-
-    /// Generate summary statistics
-    pub fn summary(&self) -> String {
-        format!(
-            "Analysis Summary:\n\
-             - Problems analyzed: {}\n\
-             - Optimizers compared: {}\n\
-             - Significant improvements: {}\n\
-             - Average effect size: {:.3}",
-            self.convergence_comparison.num_problems(),
-            self.convergence_comparison.num_optimizers(),
-            self.statistical_tests
-                .iter()
-                .filter(|t| t.is_significant())
-                .count(),
-            self.effect_sizes.iter().map(|e| e.magnitude()).sum::<f64>()
-                / self.effect_sizes.len() as f64
-        )
-    }
-}
 
 #[cfg(test)]
 mod tests {

src/analysis/plotting.rs

@@ -398,16 +398,19 @@ impl PlottingEngine {
                 );
                 // Use slightly different line styles for multiple runs of the same optimizer
                 let line_style = if run_idx == 0 {
-                   (*color).to_rgba()
+                    (*color).to_rgba()
                 } else {
                     // Make subsequent runs more transparent based on run index
-                   (*color).mix(0.8 - (run_idx as f64 * 0.05).min(0.3)).to_rgba()
+                    (*color)
+                        .mix(0.8 - (run_idx as f64 * 0.05).min(0.3))
+                        .to_rgba()
                 };
 
                 // Draw series
                 chart
                     .draw_series(LineSeries::new(series_data.clone(), &line_style))
                     .map_err(|e| anyhow::anyhow!("Series drawing error: {}", e))?;
+
                 // Add markers at regular intervals for better visibility
                 let marker_interval = series_data.len().max(1) / 20 + 1;
                 debug!("Adding markers every {} points", marker_interval);
@@ -637,12 +640,19 @@ impl PlottingEngine {
                     );
                     // Use slightly different line styles for multiple runs of the same optimizer
                     let line_style = if run_idx == 0 {
-                       (*color).to_rgba()
+                        (*color).to_rgba()
                     } else {
-                        // Make subsequent runs slightly more transparent
-                       (*color).mix(0.7).to_rgba()
+                        // Make subsequent runs more transparent based on run index
+                        (*color)
+                            .mix(0.8 - (run_idx as f64 * 0.05).min(0.3))
+                            .to_rgba()
                     };
 
+                    // Draw series
+                    chart
+                        .draw_series(LineSeries::new(series_data.clone(), &line_style))
+                        .map_err(|e| anyhow::anyhow!("Series drawing error: {}", e))?;
+
                     // Add markers for better visibility
                     let marker_interval = series_data.len().max(1) / 20 + 1;
                     debug!("Adding log markers every {} points", marker_interval);
@@ -1502,4 +1512,4 @@ mod tests {
         assert!(data.q1 < data.median);
         assert!(data.median < data.q3);
     }
-}
+}