diff --git a/IParts1000.png b/IParts1000.png new file mode 100644 index 0000000000000000000000000000000000000000..afe60990e70327de6b074f36b4219638cbf33b7d Binary files /dev/null and b/IParts1000.png differ diff --git a/RPArts_1000PTS.png b/RPArts_1000PTS.png new file mode 100644 index 0000000000000000000000000000000000000000..d4583e7f34dc844d4d26f729f3013befb017f775 Binary files /dev/null and b/RPArts_1000PTS.png differ diff --git a/RParts_density.png b/RParts_density.png new file mode 100644 index 0000000000000000000000000000000000000000..d16fc95f028683247dc004e28b3367b403aa25c0 Binary files /dev/null and b/RParts_density.png differ diff --git a/bad_graph.pdf b/bad_graph.pdf new file mode 100644 index 0000000000000000000000000000000000000000..1d4157f503b9c50101950b8e2654fc3ef48fd226 Binary files /dev/null and b/bad_graph.pdf differ diff --git a/better_graph.pdf b/better_graph.pdf new file mode 100644 index 0000000000000000000000000000000000000000..2f15db46c73c13c0c58e6f079c560299ff136794 Binary files /dev/null and b/better_graph.pdf differ diff --git a/better_graph_ellargi.pdf b/better_graph_ellargi.pdf new file mode 100644 index 0000000000000000000000000000000000000000..7f4abeea837db791c47d36c5a367a0f17f963aec Binary files /dev/null and b/better_graph_ellargi.pdf differ diff --git a/gaussian1.png b/gaussian1.png new file mode 100644 index 0000000000000000000000000000000000000000..105fedd1b8c6aa4df1f3e0f8cbc4d4cdc6b092bd Binary files /dev/null and b/gaussian1.png differ diff --git a/graph_true.pdf b/graph_true.pdf new file mode 100644 index 0000000000000000000000000000000000000000..79de6b2afad763864ec94eea375f696faa959e77 Binary files /dev/null and b/graph_true.pdf differ diff --git a/graph_true_10000.pdf b/graph_true_10000.pdf new file mode 100644 index 0000000000000000000000000000000000000000..af5399e70c9237fd1cc75aec47ffbabece0fa1a4 Binary files /dev/null and b/graph_true_10000.pdf differ diff --git a/sgi2018/src/follower/transform.h b/sgi2018/src/follower/transform.h index 92f1bec2630f7ec8e2928a167c4d47555db2e7d4..dbff98144d2bbd6aa8c0404b4e1f96ba692c43e2 100644 --- a/sgi2018/src/follower/transform.h +++ b/sgi2018/src/follower/transform.h @@ -43,14 +43,14 @@ namespace Transform // ComplexMatrix res(xiVector.size(), startIndexes.size()); - std::cout << "Entered linear path..." << std::endl; - #pragma omp parallel for + #pragma omp parallel for + for(unsigned int i = 0; i < xiVector.size(); i ++){ - std::cout << i << std::endl; Point endPoint(startPoint.omega, startPoint.size, xiVector[i]); std::vector<unsigned int> indexesResult = Follow::adaptativStep(startPoint, endPoint, startIndexes, distanceThreshold, minstepsize); ComplexVector v(indexesResult.size()); - outCsv.write( (ComplexVector) phaseSpeed(startPoint.omega, startPoint.formatedEigenvalues) ); + #pragma omp critical + outCsv.write( (ComplexVector) phaseSpeed(startPoint.omega, endPoint.formatedEigenvalues) ); for(unsigned int j = 0; j < indexesResult.size(); j ++){ v(j) = endPoint.formatedEigenvalues(indexesResult[j]); } diff --git a/sgi2018/src/main.cpp b/sgi2018/src/main.cpp index ab72b85d8d69f63716b0a61a4ca45f9e4f91a9a0..e4ab954fcc5c91b1127550a1e530a7f99e16d1e5 100644 --- a/sgi2018/src/main.cpp +++ b/sgi2018/src/main.cpp @@ -65,8 +65,8 @@ int main(int argc, char *argv[]) { std::cout << "Starting..." << std::endl; const number omega = 20*2*pi; // 20Hz - const int N_gPC = 1000; - const unsigned int size = (argc > 1) ? atoi(argv[1]) : 50; + const int N_gPC = 100000; + const unsigned int size = (argc > 1) ? atoi(argv[1]) : 200; const std::string outPutfolder = Csv::confirmedFolder("output/"); Generator::use_constant_continuation = true; // makes eigenvalues easier to follow ?