Fixing undefined behaviour in examples

jatinchowdhury18 · Jul 8, 2024 · c7b1a73 · c7b1a73
1 parent 8c1847d
commit c7b1a73
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 17 deletions.
diff --git a/examples/conv1d_stateless_example/conv1d_stateless_example.cpp b/examples/conv1d_stateless_example/conv1d_stateless_example.cpp
@@ -8,14 +8,11 @@ namespace fs = std::filesystem;
 
 std::string getFileFromRoot(fs::path exe_path, const std::string& path)
 {
-    // get path of RTNeural root directory
-    while((--exe_path.end())->string() != "RTNeural")
-        exe_path = exe_path.parent_path();
+    auto root_path = exe_path.parent_path();
+    while(root_path.filename() != "RTNeural")
+        root_path = root_path.parent_path();
 
-    // get path of model file
-    exe_path.append(path);
-
-    return exe_path.string();
+    return root_path.append(path).string();
 }
 
 int main(int /*argc*/, char* argv[])

diff --git a/examples/custom_layer_model/custom_layer_model.cpp b/examples/custom_layer_model/custom_layer_model.cpp
@@ -16,7 +16,7 @@ namespace fs = std::filesystem;
 std::string getModelFile (fs::path path)
 {
     // get path of RTNeural root directory
-    while((--path.end())->string() != "RTNeural")
+    while(path.filename() != "RTNeural")
         path = path.parent_path();
 
     // get path of model file

diff --git a/examples/hello_rtneural/hello_rtneural.cpp b/examples/hello_rtneural/hello_rtneural.cpp
@@ -1,18 +1,18 @@
-#include <iostream>
-#include <filesystem>
 #include <RTNeural/RTNeural.h>
+#include <filesystem>
+#include <iostream>
 
 namespace fs = std::filesystem;
 
-std::string getModelFile (fs::path path)
+std::string getModelFile(fs::path path)
 {
     // get path of RTNeural root directory
-    while((--path.end())->string() != "RTNeural")
+    while(path.filename() != "RTNeural")
         path = path.parent_path();
 
     // get path of model file
     path.append("examples/hello_rtneural/test_net.json");
-    
+
     return path.string();
 }
 
@@ -29,7 +29,7 @@ int main(int argc, char* argv[])
     auto model = RTNeural::json_parser::parseJson<float>(jsonStream, true);
 
     float testInput[1] = { 5.0f };
-    float testOutput = model->forward (testInput);
+    float testOutput = model->forward(testInput);
     std::cout << "Test output: " << testOutput << std::endl;
 
     return 0;

diff --git a/examples/rtneural_static_model/rtneural_static_model.cpp b/examples/rtneural_static_model/rtneural_static_model.cpp
@@ -7,7 +7,7 @@ namespace fs = std::filesystem;
 std::string getModelFile (fs::path path)
 {
     // get path of RTNeural root directory
-    while((--path.end())->string() != "RTNeural")
+    while(path.filename() != "RTNeural")
         path = path.parent_path();
 
     // get path of model file

diff --git a/examples/torch/torch_conv1d/torch_conv1d.cpp b/examples/torch/torch_conv1d/torch_conv1d.cpp
@@ -7,7 +7,7 @@ namespace fs = std::filesystem;
 
 std::string getRootDir(fs::path path)
 {
-    while((--path.end())->string() != "RTNeural")
+    while(path.filename() != "RTNeural")
         path = path.parent_path();
     return path.string();
 }

diff --git a/examples/torch/torch_gru/torch_gru.cpp b/examples/torch/torch_gru/torch_gru.cpp
@@ -7,7 +7,7 @@ namespace fs = std::filesystem;
 
 std::string getRootDir(fs::path path)
 {
-    while((--path.end())->string() != "RTNeural")
+    while(path.filename() != "RTNeural")
         path = path.parent_path();
     return path.string();
 }