use docker to test ubuntu builds

Author: AzizZayed

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.12)
 project(ComputerAlgebraSystem
-        VERSION 0.0.1
+        VERSION 0.1.0
         DESCRIPTION "A computer algebra system"
         LANGUAGES CXX)
 
@@ -9,22 +9,27 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-include(FetchContent)
-
 if (CMAKE_BUILD_TYPE MATCHES Debug)
-    add_compile_options(
-            -Wall
-            -Wextra
-            -fsanitize=address
-            -fsanitize=undefined
-    )
-    add_link_options(
-            -fsanitize=address
-            -fsanitize=undefined
-    )
+    if (MSVC)
+        message(STATUS "MSVC debug build.")
+        add_compile_options(/W4 /WX)
+    else()
+        message(STATUS "GCC/Clang debug build.")
+        add_compile_options(-Wall -Wextra)
+    endif()
+
+    # Enable ASAN and UBSAN
+    if (MSVC)
+        add_compile_options(/fsanitize=address,undefined)
+        add_link_options(/fsanitize=address,undefined)
+    else()
+        add_compile_options(-fsanitize=address,undefined -fno-omit-frame-pointer)
+        add_link_options(-fsanitize=address,undefined -fno-omit-frame-pointer)
+    endif()
 endif()
 
 add_subdirectory("cas")
+include(FetchContent)
 
 FetchContent_Declare(glfw
         GIT_REPOSITORY https://github.com/glfw/glfw
@@ -50,6 +55,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
             src/render/metal/Window.h
             src/render/metal/Grid.h
             src/render/metal/Surface.h
+            src/render/metal/Model.h
             src/render/metal/shader.metal
             ${imgui_SOURCE_DIR}/imgui.cpp
             ${imgui_SOURCE_DIR}/imgui_demo.cpp
@@ -65,6 +71,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
             "-framework Cocoa"
             "-framework MetalKit"
             "-framework ModelIO")
+
 elseif (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Windows")
     message(STATUS "Windows or Linux OS detected - Using OpenGL for graphics")
     set(MAIN_FILE "src/render/opengl/main.cpp")
@@ -75,4 +82,4 @@ elseif (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Windows"
 endif()
 
 add_executable(${PROJECT_NAME} ${MAIN_FILE} ${HEADERS_AMD_SOURCES})
-target_link_libraries(${PROJECT_NAME} PRIVATE "cas" ${LINK_LIBS})
+target_link_libraries(${PROJECT_NAME} PRIVATE "cas" ${LINK_LIBS})

Dockerfile-Ubuntu

@@ -1,6 +1,6 @@
 # Used to test Windows builds
 
-FROM mcr.microsoft.com/windows/servercore:ltsc2019
+FROM mcr.microsoft.com/dotnet/sdk:5.0
 
 # Install MinGW
 RUN powershell -Command \
@@ -24,3 +24,17 @@ COPY . /cas-mingw
 # Build project
 WORKDIR /cas-mingw
 RUN .\build.bat
+
+# Run debug tests
+#WORKDIR /cas-mingw/build-debug/cas
+#RUN ctest
+
+# Run release tests
+#WORKDIR /cas-mingw/build-release/cas
+#RUN ctest'
+
+# Run executable
+WORKDIR /cas-mingw/build-debug
+CMD [".\ComputerAlgebraSystem.exe"]
+
+

Dockerfile-Windows

@@ -8,7 +8,6 @@
 #define CAS_NAMESPACE namespace cas {
 #define CAS_NAMESPACE_END }
 
-#include "cas/data/VariableMap.h"
 #include <cmath>
 #include <cstddef>
 #include <unordered_set>

benchmark.sh

@@ -2,13 +2,13 @@
 // Created by Abd-El-Aziz Zayed on 2022-12-30.
 //
 
-#ifndef VARIABLEMAP_H
-#define VARIABLEMAP_H
-
+#ifndef CAS_VARIABLEMAP_H
+#define CAS_VARIABLEMAP_H
 
 #include <cas/CAS.h>
 #include <iterator>
 #include <stdexcept>
+#include <vector>
 
 CAS_NAMESPACE
 
@@ -55,6 +55,8 @@ class VariableMap {
     VariableMap& operator=(const VariableMap&) = delete;
 
     void clear();
+    void clear(char var);
+    void clearExceptXY();
 
     [[nodiscard]] bool contains(char var) const;
 
@@ -63,6 +65,8 @@ class VariableMap {
     double& operator[](char var);
     double at(char var) const;
 
+    size_t size() const;
+
     VariableMapIterator begin();
     VariableMapIterator end();
 
@@ -74,6 +78,7 @@ class VariableMap {
 
 private:
     static std::invalid_argument variableNotFoundException(char var);
+    static std::invalid_argument invalidVariableException(char var);
 
     static bool lowercase(char c, size_t& index);
     static bool uppercase(char c, size_t& index);
@@ -88,4 +93,4 @@ class VariableMap {
 
 CAS_NAMESPACE_END
 
-#endif//VARIABLEMAP_H
+#endif//CAS_VARIABLEMAP_H

built.bat renamed to build.bat

@@ -6,7 +6,7 @@
 #define CAS_LATEXRENDERER_H
 
 #include "cas/node/IRepresentableMath.h"
-#import "cas/plot/Function.h"
+#include "cas/plot/Function.h"
 #include "cpr/cpr.h"
 
 CAS_NAMESPACE

cas/include/cas/CAS.h

@@ -5,8 +5,9 @@
 #ifndef CAS_IMATH_H
 #define CAS_IMATH_H
 
-#include "cas/CAS.h"
 #include <cmath>
+#include "cas/CAS.h"
+#include "cas/data/VariableMap.h"
 
 CAS_NAMESPACE
 

cas/include/cas/data/VariableMap.h

@@ -6,7 +6,6 @@
 #include <sstream>
 #include <string>
 #include <utility>
-#include <vector>
 
 CAS_NAMESPACE
 
@@ -31,7 +30,7 @@ void VariableMap::insert(char var, double value) {
             uppercaseVariables.letters++;
         }
     } else {
-        throw std::invalid_argument("Variable is not a letter.");
+        throw invalidVariableException(var);
     }
 }
 
@@ -48,7 +47,7 @@ double& VariableMap::operator[](char var) {
         }
         throw variableNotFoundException(var);
     }
-    throw std::invalid_argument("Variable is not a letter.");
+    throw invalidVariableException(var);
 }
 
 double VariableMap::at(char var) const {
@@ -64,7 +63,7 @@ double VariableMap::at(char var) const {
         }
         throw variableNotFoundException(var);
     }
-    throw std::invalid_argument("Variable is not a letter.");
+    throw invalidVariableException(var);
 }
 
 VariableMapIterator VariableMap::begin() {
@@ -136,14 +135,45 @@ bool VariableMap::contains(char var) const {
     } else if (uppercase(var, index)) {
         return uppercaseVariables.validLetter[index];
     }
-    throw variableNotFoundException(var);
+    throw invalidVariableException(var);
 }
 
 void VariableMap::clear() {
     lowercaseVariables = {};
     uppercaseVariables = {};
 }
 
+void VariableMap::clear(char var) {
+    size_t index = 0;
+    if (lowercase(var, index)) {
+        if (lowercaseVariables.validLetter[index]) {
+            lowercaseVariables.validLetter[index] = false;
+            lowercaseVariables.letters--;
+        }
+    } else if (uppercase(var, index)) {
+        if (uppercaseVariables.validLetter[index]) {
+            uppercaseVariables.validLetter[index] = false;
+            uppercaseVariables.letters--;
+        }
+    } else {
+        throw invalidVariableException(var);
+    }
+}
+
+void VariableMap::clearExceptXY() {
+    double x = at('x');
+    double y = at('y');
+
+    clear();
+
+    insert('x', x);
+    insert('y', y);
+}
+
+size_t VariableMap::size() const {
+    return lowercaseVariables.letters + uppercaseVariables.letters;
+}
+
 std::string VariableMap::str() const {
     std::stringstream ss;
 
@@ -160,6 +190,10 @@ std::invalid_argument VariableMap::variableNotFoundException(char var) {
     return std::invalid_argument("Variable " + std::string(1, var) + " is not in the map.");
 }
 
+std::invalid_argument VariableMap::invalidVariableException(char var) {
+    return std::invalid_argument("Variable " + std::string(1, var) + " is not a letter.");
+}
+
 bool VariableMap::lowercase(char c, size_t& index) {
     bool isLowercase = c >= 'a' && c <= 'z';