improving scaling

Author: rostam

.github/workflows/ccpp.yml

@@ -1,16 +1,52 @@
+
 name: C/C++ CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-    - name: ghaction-cmake
-      uses: lpenz/ghaction-cmake@v0.1
-      with:
-        dependencies: libwxgtk3.0-dev libwxbase3.0-dev
-       
+      - uses: actions/checkout@v3
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libwxgtk3.0-gtk3-dev libwxbase3.0-dev
+          sudo apt-get install -y libboost-all-dev
+          sudo apt-get install -y build-essential
+          sudo apt-get install -y cmake
+
+      - name: Create build directory
+        run: mkdir build
+
+      - name: Configure CMake
+        run: |
+          cd build
+          cmake ..
+
+      - name: Build
+        run: |
+          cd build
+          cmake --build .
+
+      - name: Run tests
+        run: |
+          cd build
+          ctest --output-on-failure
+
+      - name: Install gcovr
+        run: sudo apt-get install -y gcovr
+
+      - name: Generate coverage report
+        run: |
+            cd build
+            gcovr -r .. --html --html-details -o coverage.html
+
+      - name: Upload coverage report
+        uses: actions/upload-artifact@v3
+        with:
+          name: coverage-report
+          path: build/coverage.html
+

.gitignore

@@ -0,0 +1,3 @@
+build/
+cmake-build-debug/
+cmake-build-release/

CGTeaApp.cpp

@@ -26,13 +26,13 @@
 
 bool CGTeaApp::OnInit()
 {
-    auto *sizer = new wxBoxSizer(wxHORIZONTAL);
-    auto *frame = new CGTeaFrame("CGTea", wxPoint(100, 100), wxSize(1200, 600) );
-    auto *cgTeaSidebar = new CGTeaSidebar(frame, wxID_ANY);
+    auto sizer = std::make_unique<wxBoxSizer>(wxHORIZONTAL);
+    auto frame = new CGTeaFrame("CGTea", wxPoint(100, 100), wxSize(1200, 600) );
+    auto cgTeaSidebar = new CGTeaSidebar(frame, wxID_ANY);
     drawPane = new BasicDrawPane( frame );
     sizer->Add(cgTeaSidebar, 1, wxEXPAND | wxALL);
     sizer->Add(drawPane, 4, wxEXPAND | wxALL);
-    frame->SetSizer(sizer);
+    frame->SetSizer(sizer.release());
     frame->SetAutoLayout(true);
     frame->SetIcon(wxIcon(wxT("gtea.xpm")));
     frame->Show( true );

CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.10)
 project(CGTea)
 set(CMAKE_CXX_STANDARD 17)
+enable_testing()
 find_package(wxWidgets REQUIRED COMPONENTS net core base)
 include(${wxWidgets_USE_FILE})
 include_directories(${Boost_INCLUDE_DIRS})
@@ -9,8 +10,12 @@ file(GLOB Reports "reports/*.cpp")
 file(GLOB Generators "generators/*.cpp")
 file(GLOB Actions "actions/*.cpp")
 file(GLOB ConjectureCheck "ConjectureCheck/*.cpp")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
 #set( CMAKE_CXX_FLAGS "`wx-config --cxxflags --libs`")
 add_executable(CGTea CGTeaApp.cpp BasicDrawPane.cpp CGTeaFrame.cpp CGTeaSidebar.cpp  ${Reports} ${Generators} ${Actions})
-add_executable(BoostTest ${Reports} ${Generators}  ${BoostTestSrc} ${ConjectureCheck} ${Actions})
+add_executable(BoostTest ${Reports} ${Generators}  ${BoostTestSrc} ${ConjectureCheck} ${Actions}
+        tests/test_generator.cpp
+        tests/test_index.cpp
+        tests/test_g6format.cpp)
 target_link_libraries(CGTea ${wxWidgets_LIBRARIES} ${Boost_LIBRARIES})
 target_link_libraries(BoostTest ${Boost_LIBRARIES})

README.md

@@ -16,3 +16,6 @@ There are three main dependencies for this project:
     ```
 
 Please note that the project is in active development, and contributions are welcome. For more information, please refer to the source code and comments therein.
+
+### Tests
+![C/C++ CI](https://github.com/{username}/{repository}/workflows/C/C++%20CI/badge.svg)

tests/test_g6format.cpp

@@ -0,0 +1,58 @@
+//
+// Created by rostam on 15.05.25.
+//
+
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
+#include "../G6Format.h"
+
+BOOST_AUTO_TEST_SUITE(G6FormatTests)
+
+BOOST_AUTO_TEST_CASE(test_graph_size_detection)
+{
+    G6Format g6;
+    // Test small graph (n ≤ 62)
+    BOOST_CHECK_EQUAL(g6.graphsize("A_"), 1);
+    BOOST_CHECK_EQUAL(g6.graphsize("B?"), 2);
+
+    // Test larger graph
+    BOOST_CHECK_EQUAL(g6.graphsize(":?@"), 63);
+}
+
+BOOST_AUTO_TEST_CASE(test_empty_graph_conversion)
+{
+    G6Format g6;
+    Graph g;
+    boost::add_vertex(g);
+    boost::add_vertex(g);
+
+    std::string g6str = g6.graphToG6(g);
+    Graph decoded = g6.stringToGraph(g6str);
+
+    BOOST_CHECK_EQUAL(boost::num_vertices(decoded), 2);
+    BOOST_CHECK_EQUAL(boost::num_edges(decoded), 0);
+}
+
+BOOST_AUTO_TEST_CASE(test_simple_graph_conversion)
+{
+    G6Format g6;
+    Graph g;
+    boost::add_vertex(g);
+    boost::add_vertex(g);
+    boost::add_vertex(g);
+    boost::add_edge(0, 1, g);
+    boost::add_edge(1, 2, g);
+
+    std::string g6str = g6.graphToG6(g);
+    Graph decoded = g6.stringToGraph(g6str);
+
+    BOOST_CHECK_EQUAL(boost::num_vertices(decoded), 3);
+    BOOST_CHECK_EQUAL(boost::num_edges(decoded), 2);
+
+    // Check that specific edges exist
+    BOOST_CHECK(boost::edge(0, 1, decoded).second);
+    BOOST_CHECK(boost::edge(1, 2, decoded).second);
+    BOOST_CHECK(!boost::edge(0, 2, decoded).second);
+}
+
+BOOST_AUTO_TEST_SUITE_END()

tests/test_generator.cpp

@@ -0,0 +1,44 @@
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
+#include "../generators/CocktailParty.h"
+
+BOOST_AUTO_TEST_SUITE(CocktailPartyTests)
+
+BOOST_AUTO_TEST_CASE(test_cocktail_party_basic_properties)
+{
+    CocktailParty generator;
+    // Test with 2 pairs (4 vertices)
+    Graph g = generator.generate_with_positions(2, 0, 100, 100);
+    
+    // Check number of vertices
+    BOOST_CHECK_EQUAL(boost::num_vertices(g), 4);
+    
+    // Check number of edges
+    // In a cocktail party graph with n pairs:
+    // Each vertex connects to everyone except its pair
+    // So each vertex has 2n-2 edges
+    // Total edges = n * (2n-2) / 2 = n(n-1)
+    BOOST_CHECK_EQUAL(boost::num_edges(g), 4);
+    
+    // Check that pairs are not connected
+    BOOST_CHECK(!boost::edge(0, 2, g).second);
+    BOOST_CHECK(!boost::edge(1, 3, g).second);
+}
+
+BOOST_AUTO_TEST_CASE(test_cocktail_party_connectivity)
+{
+    CocktailParty generator;
+    Graph g = generator.generate_with_positions(3, 0, 100, 100);
+    
+    // For 3 pairs (6 vertices), each vertex should have 4 connections
+    // (connects to all except its pair)
+    for(unsigned int i = 0; i < 3; ++i) {
+        int degree_i = boost::out_degree(i, g);
+        BOOST_CHECK_EQUAL(degree_i, 4);
+        
+        int degree_i_pair = boost::out_degree(i + 3, g);
+        BOOST_CHECK_EQUAL(degree_i_pair, 4);
+    }
+}
+
+BOOST_AUTO_TEST_SUITE_END()

tests/test_index.cpp

@@ -0,0 +1,44 @@
+//
+// Created by rostam on 15.05.25.
+//
+
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
+#include "../reports/AdditiveHarary.h"
+#include <boost/graph/adjacency_list.hpp>
+
+BOOST_AUTO_TEST_SUITE(AdditiveHararyTests)
+
+BOOST_AUTO_TEST_CASE(test_empty_graph)
+{
+    Graph g;
+    AdditiveHararyIndex harary;
+    BOOST_CHECK_EQUAL(harary.report(g), "0");
+}
+
+BOOST_AUTO_TEST_CASE(test_single_edge)
+{
+    Graph g;
+    boost::add_vertex(g);
+    boost::add_vertex(g);
+    boost::add_edge(0, 1, g);
+
+    AdditiveHararyIndex harary;
+    BOOST_CHECK_EQUAL(harary.report(g), "1");
+}
+
+BOOST_AUTO_TEST_CASE(test_triangle)
+{
+    Graph g;
+    boost::add_vertex(g);
+    boost::add_vertex(g);
+    boost::add_vertex(g);
+    boost::add_edge(0, 1, g);
+    boost::add_edge(1, 2, g);
+    boost::add_edge(2, 0, g);
+
+    AdditiveHararyIndex harary;
+    BOOST_CHECK_EQUAL(harary.report(g), "3");
+}
+
+BOOST_AUTO_TEST_SUITE_END()