more changes

Author: nawazishkhan1-nk

Libs/Particles/ParticleShapeStatistics.cpp

@@ -497,6 +497,7 @@ ParticleShapeStatistics::ParticleShapeStatistics(std::shared_ptr<Project> projec
 
 Eigen::VectorXd ParticleShapeStatistics::compute_regression_mean(
     const std::vector<double>& explanatory_variables) const {
+      std::cout << "Computing mean for regression" << std::endl;
   Eigen::VectorXd t = Eigen::Map<const Eigen::VectorXd>(
       explanatory_variables.data(), explanatory_variables.size());
 

Libs/Particles/ParticleShapeStatistics.h

@@ -159,7 +159,6 @@ class ParticleShapeStatistics {
   // for regression tasks
   Eigen::VectorXd slope_;
   Eigen::VectorXd intercept_;
-  bool regression_enabled_;
 
   std::vector<double> percent_variance_by_mode_;
   Eigen::MatrixXd principals_;

Studio/Analysis/AnalysisTool.cpp

@@ -713,7 +713,7 @@ bool AnalysisTool::compute_stats() {
 
 bool check_explanatory_variable_limits() {
   auto subjects = session_->get_project()->get_subjects();
-  explanatory_variable_limits_.resize(2);
+  explanatory_variable_limits_.resize(2, 0.0);
   explanatory_variable_limits_[0] = std::numeric_limits<double>::max();
   explanatory_variable_limits_[1] = std::numeric_limits<double>::lowest();
   for (auto sub : subjects) {
@@ -786,7 +786,7 @@ Particles AnalysisTool::get_shape_points(int mode, double value) {
     ui_->explained_variance->setText("");
     ui_->cumulative_explained_variance->setText("");
   }
-  auto mean = !regression_enabled_ ? stats_.get_mean() : stats_.compute_regression_mean(ui_->get_explanatory_variable_value());
+  auto mean = !get_regression_analysis_status() ? stats_.get_mean() : stats_.compute_regression_mean(ui_->get_explanatory_variable_value());
   temp_shape_ = mean + (e * (value * lambda));
 
   auto positions = temp_shape_;
@@ -1155,7 +1155,8 @@ double AnalysisTool::get_pca_value() {
 
 std::vector<double> AnalysisTool::get_explanatory_variable_value() {
   int slider_value = ui_->explanatoryVariableSlider->value();
-  return {t_min + (static_cast<double>(slider_value) / 100.0) * (t_max - t_min)};
+  // return {t_min + (static_cast<double>(slider_value) / 100.0) * (t_max - t_min)};
+  return {explanatory_variable_limits_[0] + (static_cast<double>(slider_value) / 100.0) * (explanatory_variable_limits_[1] - explanatory_variable_limits_[0])};
 
 }
 

Studio/Interface/ShapeWorksStudioApp.cpp

@@ -1528,14 +1528,6 @@ void ShapeWorksStudioApp::open_project(QString filename) {
 
   groom_tool_->load_params();
   optimize_tool_->load_params();
-
-  if (optimize_tool_->get_regression_analysis_status())
-  {
-    // Verify if slope and intercept files exist
-    // auto particles_dir = session_->get_filename().dir().absolutePath().toStdString();
-    // auto slope_filename = session_->get_filename().toStdString();
-  }
-  analysis_tool_->store_settings();
   update_from_preferences();
 
   update_tool_mode();