Merge pull request #56 from Amiable-Vagabond/develop

Merging gtest and random number conversion

Author: jmaack24

.github/workflows/CI.yml

@@ -4,9 +4,9 @@ name: CMake on multiple platforms
 
 on:
   push:
-    branches: [ main ]
+    branches: [ develop ]
   pull_request:
-    branches: [ main ]
+    branches: [ develop ]
 
 jobs:
   build:
@@ -54,6 +54,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+  
+    - name: Install lfontconfig
+      if: matrix.os == 'ubuntu-latest'
+      run: sudo apt-get install -y libfontconfig1-dev
 
     - name: Set reusable strings
       # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
@@ -73,12 +77,24 @@ jobs:
         -DSOLTRACE_BUILD_GUI=OFF
         -S ${{ github.workspace }}
 
-    - name: Build
+    - name: Build-Windows
       # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
-      run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} --target strace
+      if: matrix.os == 'windows-latest'
+      run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} --target strace TestExecutable
+      
+    - name: Build-Mac-Linux
+      if: matrix.os != 'windows-latest'
+      run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} --target strace TestExecutable
 
-    # - name: Test
-    #   working-directory: ${{ steps.strings.outputs.build-output-dir }}
-    #   # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
-    #   # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-    #   run: ctest --build-config ${{ matrix.build_type }}
+    # - name: List test directory
+    #   run: |
+    #       dir build/google-tests
+          
+
+    - name: Test
+      working-directory: ${{ steps.strings.outputs.build-output-dir }}
+      # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: |
+        cd ${{ steps.strings.outputs.build-output-dir }}/google-tests
+        ctest --output-on-failure --build-config ${{ matrix.build_type }}

CMakeLists.txt

@@ -5,10 +5,12 @@ Project(soltrace_ui VERSION 1.0.0)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
-option(SOLTRACE_BUILD_GUI "Build the GUI parts of SolTrace" ON)
+option(SOLTRACE_BUILD_GUI "Build the GUI parts of Soltrace" ON)
 
 add_subdirectory(coretrace)
+add_subdirectory(google-tests)
 
 if(SOLTRACE_BUILD_GUI)
-  add_subdirectory(app)
+	add_subdirectory(app)
 endif()
+

app/deploy/samples/Aperture Examples.stinput

@@ -1,3 +1,4 @@
+# SOLTRACE VERSION 2016.1.1 INPUT FILE
 SUN	PTSRC	0	SHAPE	p	SIGMA	2.73	HALFWIDTH	4.65
 XYZ	0	0	100	USELDH	0	LDH	39.5	90	10
 USER SHAPE DATA	0

coretrace/mtrand.h

@@ -133,7 +133,7 @@ class MTRand {
 	uint32 *pNext;     // next value to get from state
 	int left;          // number of values left before reload needed
 
-    std::default_random_engine random_generator;
+	std::mt19937_64 random_generator;
     std::normal_distribution<double> normal_distribution; // (5.0, 2.0);
     std::uniform_real_distribution<double> uniform_distribution;
     std::uniform_int_distribution<int> uniform_int_distribution;