some small improvements

Author: ettoh

include/dmsc/edge.hpp

@@ -125,8 +125,8 @@ class InterSatelliteLink {
     float getMaxAngle() const { return max_angle; }
     const Satellite& getV1() const { return *v1; }
     const Satellite& getV2() const { return *v2; }
-    const uint32_t getV1Idx() const { return v1_idx; }
-    const uint32_t getV2Idx() const { return v2_idx; }
+    uint32_t getV1Idx() const { return v1_idx; }
+    uint32_t getV2Idx() const { return v2_idx; }
     float getRadiusCentralMass() const { return cm.radius_central_mass; }
 
   private:

include/dmsc/instance.hpp

@@ -27,16 +27,12 @@ class AdjacencyMatrix {
     };
 
     AdjacencyMatrix() = delete;
-    AdjacencyMatrix(const size_t size, const Item& default_value = Item());
+    AdjacencyMatrix(const size_t size, const Item& default_value);
     std::vector<Item>& operator[](size_t row) { return matrix[row]; }
     const std::vector<Item>& operator[](size_t row) const { return matrix[row]; }
     void clear();
 
     std::vector<std::vector<Item>> matrix;
-
-    // GETTER
-    std::vector<Item> column(const size_t column) const;
-    std::vector<Item> row(const size_t row) const;
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -115,13 +111,13 @@ class PhysicalInstance {
     const std::vector<Satellite>& getSatellites() const { return satellites; }
     const std::vector<InterSatelliteLink>& getISL() const { return intersatellite_links; }
     const AdjacencyMatrix& getAdjacencyMatrix() const { return adjacency_matrix; }
-    const size_t islCount() const { return intersatellite_links.size(); }
-    const size_t satelliteCount() const { return satellites.size(); }
+    size_t islCount() const { return intersatellite_links.size(); }
+    size_t satelliteCount() const { return satellites.size(); }
 
   private:
     std::vector<Satellite> satellites;
     std::vector<InterSatelliteLink> intersatellite_links;
-    AdjacencyMatrix adjacency_matrix = AdjacencyMatrix(0);
+    AdjacencyMatrix adjacency_matrix = AdjacencyMatrix(0, AdjacencyMatrix::Item(~0u, ~0u));
     CentralMass cm;
     enum FileReadingMode { READ_INIT, READ_ORBIT, READ_EDGE }; // order must match blocks in file-format
 

src/instance.cpp

@@ -36,21 +36,6 @@ void AdjacencyMatrix::clear() {
 
 // ------------------------------------------------------------------------------------------------
 
-std::vector<AdjacencyMatrix::Item> AdjacencyMatrix::column(const size_t column) const {
-    std::vector<Item> result;
-    result.reserve(matrix.size());
-    for (int i = 0; i < matrix.size(); i++) {
-        result.push_back(matrix[i][column]);
-    }
-    return result;
-}
-
-// ------------------------------------------------------------------------------------------------
-
-std::vector<AdjacencyMatrix::Item> AdjacencyMatrix::row(const size_t row) const { return matrix[row]; }
-
-// ------------------------------------------------------------------------------------------------
-
 // ========================
 // = Instance
 // ========================
@@ -286,7 +271,7 @@ void PhysicalInstance::removeInvalidISL() {
 
 // ------------------------------------------------------------------------------------------------
 
-float rad(const float deg) { return deg * 0.01745329251994329577f; }; // convert degrees to radians
-float deg(const float rad) { return rad * 57.2957795130823208768f; }; // convert radians to degrees
+float rad(const float deg) { return deg * 0.01745329251994329577f; } // convert degrees to radians
+float deg(const float rad) { return rad * 57.2957795130823208768f; } // convert radians to degrees
 
 } // namespace dmsc

src/opengl_widgets.cpp

@@ -319,7 +319,7 @@ void OpenGLWidget::recalculateOrbitPositions() {
         nmbr_vertecies = satellite_subscene->getObjectInfo().at(0).number_vertices;
     for (const Satellite& o : problem_instance.getSatellites()) {
         glm::vec3 offset = o.cartesian_coordinates(sim_time) / real_world_scale;
-        for (int i = 0; i < nmbr_vertecies; i++) {
+        for (size_t i = 0; i < nmbr_vertecies; i++) {
             positions.push_back(offset.x);
             positions.push_back(offset.y);
             positions.push_back(offset.z);
@@ -684,7 +684,7 @@ void OpenGLWidget::buildGUI() {
         ImGui::SetWindowSize(ImVec2(350, 300));
 
         ImGui::PushItemWidth(ImGui::GetFontSize() * -12);
-        char* btn_text = paused ? "Play" : "Pause";
+        const char* btn_text = paused ? "Play" : "Pause";
         if (ImGui::Button(btn_text)) {
             paused = !paused;
         }

src/solver/greedy_next.cpp

@@ -29,7 +29,7 @@ Solution GreedyNext::solve() {
         float t_next = INFINITY; // absolute time
 
         // find best edge depending on the time passed
-        for (int i = 0; i < remaining_edges.size(); i++) {
+        for (size_t i = 0; i < remaining_edges.size(); i++) {
             const InterSatelliteLink& e = *remaining_edges.at(i);
             float next_communication = nextCommunication(e, curr_time);
 

src/solver/greedy_next_khop.cpp

@@ -11,7 +11,7 @@ namespace solver {
  */
 struct GreedyNextKHop::Communication {
     ScheduledCommunication scheduled_communication = {~0u, ~0u};
-    AdjacencyMatrix possible_paths = AdjacencyMatrix(0);
+    AdjacencyMatrix possible_paths = AdjacencyMatrix(0, AdjacencyMatrix::Item(~0u, ~0u));
     uint32_t forward_idx = 0u; // index of current vertex for the forward direction (sat1 -> sat2)
 };
 
@@ -46,7 +46,7 @@ Solution GreedyNextKHop::solve() {
         float t_next = INFINITY; // absolute time
 
         // find best edge depending on the time passed
-        for (int i = 0; i < remaining_communications.size(); i++) {
+        for (uint32_t i = 0; i < remaining_communications.size(); i++) {
             const Communication& com = remaining_communications[i];
 
             std::vector<AdjacencyMatrix::Item> possible_neighbours = com.possible_paths[com.forward_idx];