diff --git a/IsotropicRemesher.cc b/IsotropicRemesher.cc index a671c6c2379adcd25a12dc7620c61b337cd46da7..a55a7adb050f916d54ccaf87ce80b098a1b4bf55 100644 --- a/IsotropicRemesher.cc +++ b/IsotropicRemesher.cc @@ -1140,6 +1140,7 @@ void IsotropicRemesher::DataOutput(Embedding *embedding, *(avgmetaedgelength-embedding->CalculateEdgeLength(meh)); } metaedgelengthdeviation /= meta_mesh->n_edges(); + metaedgelengthdeviation = std::sqrt(metaedgelengthdeviation); double avgvalence = 0.0; double valencedeviation = 0.0; for (auto mvh : meta_mesh->vertices()) { @@ -1148,6 +1149,7 @@ void IsotropicRemesher::DataOutput(Embedding *embedding, } avgvalence /= meta_mesh->n_vertices(); valencedeviation /= meta_mesh->n_vertices(); + valencedeviation = std::sqrt(valencedeviation); QTextStream tstream(file); tstream << iteration << "," diff --git a/MetaMeshToolbox.cc b/MetaMeshToolbox.cc index ce08a1884465881b4dd81f8fb0f9fbfa683878ca..94864b617420647445f56520469fbaebd5971cdd 100644 --- a/MetaMeshToolbox.cc +++ b/MetaMeshToolbox.cc @@ -39,7 +39,7 @@ MetaMeshToolbox::MetaMeshToolbox(QWidget* parent) : QWidget(parent) combo_box_remeshing_strype_->addItem("None"); combo_box_remeshing_strype_->addItem("Edgewise"); combo_box_remeshing_strype_->addItem("Patchwise"); - combo_box_remeshing_strype_->setCurrentIndex(2); + combo_box_remeshing_strype_->setCurrentIndex(0); combo_box_remeshing_crorder_ = new QComboBox; combo_box_remeshing_crorder_->addItem("Random"); diff --git a/Testing.cc b/Testing.cc index b43bdb32b318fa034ac9d7fd5f082239f9f84979..f524060bc8640be544f6c4fedbd2f3e5a1ed65cc 100644 --- a/Testing.cc +++ b/Testing.cc @@ -2,6 +2,7 @@ #include <QDebug> #include <math.h> #include <random> +#include <math.h> #define BASE_MESH_ embedding_->base_mesh_ #define META_MESH_ embedding_->meta_mesh_ @@ -123,6 +124,7 @@ void Testing::DisplayMeshInformation() { *(avgmetaedgelength-embedding_->CalculateEdgeLength(meh)); } metaedgelengthdeviation /= META_MESH_->n_edges(); + metaedgelengthdeviation = std::sqrt(metaedgelengthdeviation); double avgvalence = 0.0; double valencedeviation = 0.0; for (auto mvh : META_MESH_->vertices()) { @@ -131,6 +133,7 @@ void Testing::DisplayMeshInformation() { } avgvalence /= META_MESH_->n_vertices(); valencedeviation /= META_MESH_->n_vertices(); + valencedeviation = std::sqrt(valencedeviation); qDebug() << "Base Mesh- V: " << BASE_MESH_->n_vertices() << "E: " << BASE_MESH_->n_edges() << "F: " << BASE_MESH_->n_faces()