From f6daff8c4de2fa5038af6132cfb01b2644e85d7c Mon Sep 17 00:00:00 2001
From: Grabt234 <gnorrie12@gmail.com>
Date: Sat, 30 Mar 2024 22:33:03 +0200
Subject: [PATCH 1/5] Refactor: command line input refactor

---
 config_validators/validator.cpp | 310 ++++++++++++++++++--------------
 1 file changed, 175 insertions(+), 135 deletions(-)

diff --git a/config_validators/validator.cpp b/config_validators/validator.cpp
index d046d12..3f39f4e 100644
--- a/config_validators/validator.cpp
+++ b/config_validators/validator.cpp
@@ -1,6 +1,6 @@
 // FERS input Validator Function
 // Makes calls to xml_validator.cpp and kml_visualiser.cpp
-// Script written by Michael Altshuler 
+// Script written by Michael Altshuler
 // University of Cape Town: ALTMIC003
 
 // The following implementation makes use of the Document Object Model (DOM) and a custom XSD Schema.
@@ -9,6 +9,7 @@
 #include <fstream>
 #include <string>
 #include <sstream>
+#include <vector>
 
 // Including necessary Xerces-C++ header files:
 #include <xercesc/dom/DOM.hpp>
@@ -24,18 +25,31 @@
 using namespace xercesc;
 using namespace std;
 
+void printUsage(const std::string &programName)
+{
+    std::cout << "Usage: " << programName << " [options] <arg1> <arg2> ...\n"
+              << "Options:\n"
+              << "  -h, --help    Show this help message\n"
+              << "  -p, --path    fersxml file path (required)\n"
+              << "  -v, --verbose    run with verbose outputs (optional)\n";
+}
+
 // Error handler that catches validation errors and further provides information about the errors.
-class MyErrorHandler : public ErrorHandler {
+class MyErrorHandler : public ErrorHandler
+{
 public:
-    void warning(const SAXParseException& e) {
+    void warning(const SAXParseException &e)
+    {
         cerr << "Warning: " << XMLString::transcode(e.getMessage()) << " at line " << e.getLineNumber() << ", column " << e.getColumnNumber() << endl;
     }
 
-    void error(const SAXParseException& e) {
+    void error(const SAXParseException &e)
+    {
         cerr << "Error: " << XMLString::transcode(e.getMessage()) << " at line " << e.getLineNumber() << ", column " << e.getColumnNumber() << endl;
     }
 
-    void fatalError(const SAXParseException& e) {
+    void fatalError(const SAXParseException &e)
+    {
         cerr << "Fatal Error: " << XMLString::transcode(e.getMessage()) << " at line " << e.getLineNumber() << ", column " << e.getColumnNumber() << endl;
     }
 
@@ -43,45 +57,54 @@ class MyErrorHandler : public ErrorHandler {
 };
 
 // Function to extract the file name from a given path
-std::string getFileNameFromPath(const std::string &filePath) {
+std::string getFileNameFromPath(const std::string &filePath)
+{
     size_t lastSlash = filePath.find_last_of("/\\");
     size_t lastDot = filePath.find_last_of(".");
-    if (lastSlash == std::string::npos) {
+    if (lastSlash == std::string::npos)
+    {
         lastSlash = 0;
-    } else {
+    }
+    else
+    {
         lastSlash++;
     }
     return filePath.substr(lastSlash, lastDot - lastSlash);
 }
 
-
-int main(int argc, char* argv[]) {
-
-    try {
-
-        // Check if the user provided the mode argument
-        std::string mode = "non-verbose"; // Default mode
-        std::string file_path;
-
-        if (argc == 2) {
-            file_path = argv[1];
-        } else if (argc == 3) {
-            std::string mode_arg = argv[1];
-            if (mode_arg == "-v" || mode_arg == "--verbose") {
-                mode = "verbose";
-            } else if (mode_arg == "-q" || mode_arg == "--quiet" || mode_arg == "--non-verbose") {
-                mode = "non-verbose";
-            } else {
-                std::cerr << "Invalid mode argument. Please provide '-v' or '--verbose' for verbose mode, or '-q', '--quiet', or '--non-verbose' for non-verbose mode." << std::endl;
-                return 1;
+int main(int argc, char *argv[])
+{
+
+    try
+    {
+        std::string strFilePath = "";
+        bool bRunAsVerbose = false;
+
+        // Parse command-line arguments
+        for (int i = 1; i < argc; ++i)
+        {
+            std::string arg(argv[i]);
+            if (arg == "-h" || arg == "--help")
+            {
+                printUsage(argv[0]);
+                return 0;
+            }
+            else if (arg == "-p" || arg == "--path")
+            {
+                strFilePath = argv[++i];
+            }
+            else if (arg == "-v" || arg == "--verbose")
+            {
+                std::cerr << "Running in verbose configuration\n";
+                bRunAsVerbose = true;
             }
-            file_path = argv[2];
-        } else {
-            std::cerr << "Invalid number of arguments. Please provide a file path and an optional mode (-v for verbose)." << std::endl;
-            return 1;
         }
 
-
+        if (strFilePath.empty())
+        {
+            std::cerr << "Error: no fersxml file given, run with -h\n";
+            return 1;
+        }
 
         // Initializing Xerces-C++ library:
         xercesc::XMLPlatformUtils::Initialize();
@@ -103,139 +126,156 @@ int main(int argc, char* argv[]) {
         parser.setErrorHandler(&errorHandler);
 
         // Establish a DOMDocument object and parse the input FERSXML file:
-        parser.parse(file_path.c_str());
+        parser.parse(strFilePath.c_str());
 
-        cout<< endl;
+        cout << endl;
 
-        if(parser.getErrorCount() == 0) {
-                std::cout << "User is in " << mode << " mode." << std::endl;
-                cout << endl;
+        if (parser.getErrorCount() == 0)
+        {
 
-                std::cout << "XML document is valid" << std::endl;
+            std::cout << "XML document is valid" << std::endl;
 
-                // Command to run xml_validator_output with mode and file_path as argument
-                std::string command = "./xml_validator_output " + file_path + " " + mode;
-                // Run the command using system() function
-                int result = std::system(command.c_str());
+            // Command to run xml_validator_output with mode and strFilePath as argument
+            std::string command = "./xml_validator_output " + strFilePath;
+            // Run the command using system() function
+            int result = std::system(command.c_str());
 
-                if (result == -1) {
-                    std::cerr << "Failed to run xml_validator_output." << std::endl;
-                    return 1;
-                }
+            if (result == -1)
+            {
+                std::cerr << "Failed to run xml_validator_output." << std::endl;
+                return 1;
+            }
 
-                std::cout << endl;
+            std::cout << endl;
 
-                // Prompting user whether they want to run the kml_visualiser
-                char run_kml_visualiser = 'n';
-                char custom_coordinates;
-                double referenceLatitude = -33.9545;
-                double referenceLongitude = 18.4563;
-                double referenceAltitude = 0;
-                std::string outputName;
-                std::string input;
+            // Prompting user whether they want to run the kml_visualiser
+            char run_kml_visualiser = 'n';
+            char custom_coordinates;
+            double referenceLatitude = -33.9545;
+            double referenceLongitude = 18.4563;
+            double referenceAltitude = 0;
+            std::string outputName;
+            std::string input;
 
-                std::cout << "Do you want to run the kml_visualiser program? (y/N): ";
-                std::getline(std::cin, input);
+            std::cout << "Do you want to run the kml_visualiser program? (y/N): ";
+            std::getline(std::cin, input);
 
-                if (!input.empty()) {
-                    run_kml_visualiser = input[0];
-                }
+            if (!input.empty())
+            {
+                run_kml_visualiser = input[0];
+            }
 
-                if (run_kml_visualiser == 'y' || run_kml_visualiser == 'Y') {
-                    std::cout << "Name a KML output file (defualt file name = file name of fersxml): ";
-                    std::getline(std::cin, outputName);
+            if (run_kml_visualiser == 'y' || run_kml_visualiser == 'Y')
+            {
+                std::cout << "Name a KML output file (defualt file name = file name of fersxml): ";
+                std::getline(std::cin, outputName);
 
-                    if (outputName.empty()) {
-                        outputName = getFileNameFromPath(file_path);
+                if (outputName.empty())
+                {
+                    outputName = getFileNameFromPath(strFilePath);
+                }
+
+                std::cout << "Do you want to enter custom referenceLatitude, referenceLongitude, and referenceAltitude? (y/N): ";
+                input.clear();
+                std::getline(std::cin, input);
+                custom_coordinates = input.empty() ? 'n' : input[0];
+                std::cout << "Default coordinates set to University of Cape Town: <133.9577° S, 18.4612° E, 0>" << std::endl;
+
+                if (custom_coordinates == 'y' || custom_coordinates == 'Y')
+                {
+                    std::string input;
+
+                    std::cout << "Enter referenceLatitude (default: -33.9545): ";
+                    std::cin >> input;
+                    std::istringstream iss_latitude(input);
+                    if (!(iss_latitude >> referenceLatitude))
+                    {
+                        std::cerr << "Invalid input. Please enter a valid number for referenceLatitude." << std::endl;
+                        return 1;
                     }
 
-                    std::cout << "Do you want to enter custom referenceLatitude, referenceLongitude, and referenceAltitude? (y/N): ";
-                    input.clear();
-                    std::getline(std::cin, input);
-                    custom_coordinates = input.empty() ? 'n' : input[0];
-                    std::cout << "Default coordinates set to University of Cape Town: <133.9577° S, 18.4612° E, 0>" << std::endl;
-
-                    if (custom_coordinates == 'y' || custom_coordinates == 'Y') {
-                        std::string input;
-
-                        std::cout << "Enter referenceLatitude (default: -33.9545): ";
-                        std::cin >> input;
-                        std::istringstream iss_latitude(input);
-                        if (!(iss_latitude >> referenceLatitude)) {
-                            std::cerr << "Invalid input. Please enter a valid number for referenceLatitude." << std::endl;
-                            return 1;
-                        }
-
-                        std::cout << "Enter referenceLongitude (default: 18.4563): ";
-                        std::cin >> input;
-                        std::istringstream iss_longitude(input);
-                        if (!(iss_longitude >> referenceLongitude)) {
-                            std::cerr << "Invalid input. Please enter a valid number for referenceLongitude." << std::endl;
-                            return 1;
-                        }
-
-                        std::cout << "Enter referenceAltitude (default: 0): ";
-                        std::cin >> input;
-                        std::istringstream iss_altitude(input);
-                        if (!(iss_altitude >> referenceAltitude)) {
-                            std::cerr << "Invalid input. Please enter a valid number for referenceAltitude." << std::endl;
-                            return 1;
-                        }
+                    std::cout << "Enter referenceLongitude (default: 18.4563): ";
+                    std::cin >> input;
+                    std::istringstream iss_longitude(input);
+                    if (!(iss_longitude >> referenceLongitude))
+                    {
+                        std::cerr << "Invalid input. Please enter a valid number for referenceLongitude." << std::endl;
+                        return 1;
                     }
 
-                    std::string kml_visualiser_command = "./kml_visualiser";
-
-                    if (custom_coordinates == 'y' || custom_coordinates == 'Y') {
-                        kml_visualiser_command += " " + file_path + " " + outputName + ".kml" + " " + std::to_string(referenceLatitude) + " " + std::to_string(referenceLongitude) + " " + std::to_string(referenceAltitude);
-                        
-                        int kml_visualiser_result = std::system(kml_visualiser_command.c_str());
-
-                        if (kml_visualiser_result == -1) {
-                            std::cerr << "Failed to run kml_visualiser." << std::endl;
-                            return 1;
-                        }
-                    } else {
-                        kml_visualiser_command += " " + file_path + " " + outputName + ".kml";
-                        int kml_visualiser_result = std::system(kml_visualiser_command.c_str());
-
-                        if (kml_visualiser_result == -1) {
-                            std::cerr << "Failed to run kml_visualiser." << std::endl;
-                            return 1;
-                        }
+                    std::cout << "Enter referenceAltitude (default: 0): ";
+                    std::cin >> input;
+                    std::istringstream iss_altitude(input);
+                    if (!(iss_altitude >> referenceAltitude))
+                    {
+                        std::cerr << "Invalid input. Please enter a valid number for referenceAltitude." << std::endl;
+                        return 1;
                     }
+                }
+
+                std::string kml_visualiser_command = "./kml_visualiser";
 
-                    std::cout << outputName + ".kml" + " outputted to current working directory." << std::endl; 
+                if (custom_coordinates == 'y' || custom_coordinates == 'Y')
+                {
+                    kml_visualiser_command += " " + strFilePath + " " + outputName + ".kml" + " " + std::to_string(referenceLatitude) + " " + std::to_string(referenceLongitude) + " " + std::to_string(referenceAltitude);
 
-                } else if (run_kml_visualiser != 'n' && run_kml_visualiser != 'N') {
-                    std::cerr << "Invalid input. Please enter 'y' for yes or 'n' for no." << std::endl;
-                    return 1;
+                    int kml_visualiser_result = std::system(kml_visualiser_command.c_str());
+
+                    if (kml_visualiser_result == -1)
+                    {
+                        std::cerr << "Failed to run kml_visualiser." << std::endl;
+                        return 1;
+                    }
+                }
+                else
+                {
+                    kml_visualiser_command += " " + strFilePath + " " + outputName + ".kml";
+                    int kml_visualiser_result = std::system(kml_visualiser_command.c_str());
+
+                    if (kml_visualiser_result == -1)
+                    {
+                        std::cerr << "Failed to run kml_visualiser." << std::endl;
+                        return 1;
+                    }
                 }
 
+                std::cout << outputName + ".kml" + " outputted to current working directory." << std::endl;
+            }
+            else if (run_kml_visualiser != 'n' && run_kml_visualiser != 'N')
+            {
+                std::cerr << "Invalid input. Please enter 'y' for yes or 'n' for no." << std::endl;
+                return 1;
+            }
         }
 
-        else {
+        else
+        {
             std::cout << "FERSXML invalid: Take note of given errors and warnings above." << std::endl;
         }
 
-            // Function call deallocates memory associated with he parsed FERSXML document.
-            //parser.resetDocumentPool();
-            // Shuts down and deallocates any memory associated with the Xerces-C++ library.
-            //xercesc::XMLPlatformUtils::Terminate();
-            return 0;
-
-    } catch (const xercesc::XMLException& e) {
+        // Function call deallocates memory associated with he parsed FERSXML document.
+        // parser.resetDocumentPool();
+        // Shuts down and deallocates any memory associated with the Xerces-C++ library.
+        // xercesc::XMLPlatformUtils::Terminate();
+        return 0;
+    }
+    catch (const xercesc::XMLException &e)
+    {
         std::cerr << "Error parsing XML document: " << e.getMessage() << std::endl;
         return 1;
-
-    }  catch (const xercesc::DOMException& e) {
+    }
+    catch (const xercesc::DOMException &e)
+    {
         std::cerr << "Error parsing XML document: " << e.getMessage() << std::endl;
         return 1;
-
-    } catch (const xercesc::SAXParseException& e) {
+    }
+    catch (const xercesc::SAXParseException &e)
+    {
         std::cerr << "Error parsing XML document: " << e.getMessage() << " at line " << e.getLineNumber() << std::endl;
         return 1;
-
-    } catch (...) {
+    }
+    catch (...)
+    {
         std::cerr << "Error parsing XML document: unknown exception" << std::endl;
         return 1;
     }

From c0b7aa2f0c4154c20892be4fcf4bae597525ec6f Mon Sep 17 00:00:00 2001
From: Grabt234 <gnorrie12@gmail.com>
Date: Sat, 30 Mar 2024 23:14:55 +0200
Subject: [PATCH 2/5] Chore: more refactoring of parser

---
 xml_schema/README.md    |   6 +
 xml_schema/fers-xml.dtd | 121 +++++++++++++
 xml_schema/fers-xml.xsd | 385 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 512 insertions(+)
 create mode 100644 xml_schema/README.md
 create mode 100644 xml_schema/fers-xml.dtd
 create mode 100644 xml_schema/fers-xml.xsd

diff --git a/xml_schema/README.md b/xml_schema/README.md
new file mode 100644
index 0000000..45c2d62
--- /dev/null
+++ b/xml_schema/README.md
@@ -0,0 +1,6 @@
+# Schema
+
+- dtd is an older xml descriptor used in the original implementation of unit testing
+- xsd is used for xml validation
+
+note: when chagning xml defenitions - both files should be changed and relevant changes propogated throughout the codebase
\ No newline at end of file
diff --git a/xml_schema/fers-xml.dtd b/xml_schema/fers-xml.dtd
new file mode 100644
index 0000000..09400cd
--- /dev/null
+++ b/xml_schema/fers-xml.dtd
@@ -0,0 +1,121 @@
+<!-- DTD for FERS XML simulation script files. Script files must conform to this DTD or simulation results are likely to be unreliable. -->
+<!-- Marc Brooker mbrooker@rrsg.ee.uct.ac.za -->
+<!ELEMENT simulation (parameters,pulse*,waveform*,timing+,antenna+,platform+,include*)>
+<!ATTLIST simulation name CDATA #REQUIRED>
+
+<!-- Simulation Parameters -->
+<!ELEMENT parameters (starttime,endtime,c?,interprate?,rate?,export?,adcbits?)>
+<!ELEMENT starttime (#PCDATA)> <!-- Start time of simulation -->
+<!ELEMENT endtime (#PCDATA)> <!-- End time of simulation -->
+<!ELEMENT c (#PCDATA)> <!-- Propagation speed -->
+<!ELEMENT interprate (#PCDATA)> <!-- Position interpolation rate for CW -->
+<!ELEMENT rate (#PCDATA)> <!-- Override the rendering sample rate with the specified one (Hz) -->
+<!ELEMENT randomseed (#PCDATA)> <!-- Random seed for noise and jitter (positive integer). If this is not specified, time() is used -->
+<!ELEMENT export EMPTY> <!-- Formats to export -->
+<!ATTLIST export xml (true|false) "true">
+<!ATTLIST export csv (true|false) "true"> 
+<!ATTLIST export binary (true|false) "false">
+<!ATTLIST export csvbinary (true|false) "false">
+<!ELEMENT adcbits #PCDATA>
+
+<!-- Pulsed Radar Pulse -->
+<!ELEMENT pulse (length?,rate?,power,carrier)>
+<!ATTLIST pulse name CDATA #REQUIRED
+type CDATA #REQUIRED
+filename CDATA #REQUIRED>
+<!ELEMENT length (#PCDATA)> <!-- Length of pulse (seconds) -->
+<!ELEMENT power (#PCDATA)> <!-- Pulse power (Watts) -->
+<!ELEMENT carrier (#PCDATA)> <!-- Frequency (Hz) -->
+
+<!-- Timing Source -->
+<!ELEMENT timing (frequency,jitter,freq_offset?)> <!-- Timing source. Sets frequency and jitter -->
+<!ATTLIST timing name CDATA #REQUIRED
+synconpulse (true|false) "true"> <!-- Name of the timing source -->
+<!ELEMENT noise_entry (alpha,weight)> 
+<!ELEMENT alpha (#PCDATA)> <!-- Noise category alpha -->
+<!ELEMENT weight (#PCDATA)> <!-- Weighting of noise in the category -->
+<!ELEMENT freq_offset (#PCDATA)> <!-- Offset from system frequency -->
+
+<!-- Antenna -->
+<!ELEMENT antenna (alpha?,beta?,gamma?,diameter?,azscale?,elscale?)>
+<!ATTLIST antenna name CDATA #REQUIRED
+pattern CDATA #REQUIRED>
+<!ELEMENT alpha (#PCDATA)> <!-- Parameters of antenna model (see doc/equations.tex) -->
+<!ELEMENT beta (#PCDATA)>
+<!ELEMENT gamma (#PCDATA)>
+<!ELEMENT diameter (#PCDATA)>
+<!ELEMENT azscale (#PCDATA)> <!-- Azimuth scale for Gaussian pattern -->
+<!ELEMENT elscale (#PCDATA)> <!-- Elevation scale for Gaussian pattern -->
+<!ELEMENT efficiency (#PCDATA)> <!-- The antenna efficiency factor (will be < 1 in all real-world cases) -->
+
+<!-- Platform -->
+<!ELEMENT platform (motionpath,(rotationpath|fixedrotation),(monostatic|transmitter|receiver)*,target*)>
+<!ATTLIST platform name CDATA #REQUIRED>
+
+<!-- Motionpaths and Position Waypoints -->
+<!ELEMENT motionpath (positionwaypoint+)>
+<!ATTLIST motionpath interpolation (static|linear|cubic) "static">
+<!ELEMENT positionwaypoint (x,y,altitude,time)>
+<!ELEMENT x (#PCDATA)> <!-- x position of waypoint -->
+<!ELEMENT y (#PCDATA)> <!-- y position of waypoint -->
+<!ELEMENT altitude (#PCDATA)> <!-- z (altitude) position of waypoint -->
+<!ELEMENT time (#PCDATA)> <!-- Time the platform is at the waypoint -->
+
+<!-- Constant Rate Rotation -->
+<!ELEMENT fixedrotation (startazimuth,startelevation,azimuthrate,elevationrate)>
+<!ELEMENT startazimuth (#PCDATA)> <!-- Azimuth at time 0 -->
+<!ELEMENT startelevation (#PCDATA)> <!-- Elevation at time 0 -->
+<!ELEMENT azimuthrate (#PCDATA)> <!-- Rate of change of azimuth -->
+<!ELEMENT elevationrate (#PCDATA)> <!-- Rate of change of elevation -->
+
+<!-- Rotation Paths and Waypoints -->
+<!ELEMENT rotationpath (rotationwaypoint+)>
+<!ATTLIST rotationpath interpolation (linear|cubic) #REQUIRED>
+<!ELEMENT rotationwaypoint (azimuth,elevation,time)> <!-- Waypoint along a rotation path -->
+<!ELEMENT azimuth (#PCDATA)>
+<!ELEMENT elevation (#PCDATA)>
+
+<!-- Monostatic radar installations -->
+<!ELEMENT monostatic (window_skip?,window_length?,prf?,noise_temp?)>
+<!ATTLIST monostatic name CDATA #REQUIRED
+type (pulsed|continuous) #REQUIRED
+antenna CDATA #REQUIRED
+pulse CDATA #REQUIRED
+timing CDATA #REQUIRED>
+<!ELEMENT prf (#PCDATA)> <!-- PRF required for pulse transmitters only -->
+<!ELEMENT noise_temp (#PCDATA)> <!-- Noise temperature contributed by receiver -->
+
+<!-- Standalone Transmitter -->
+<!ELEMENT transmitter (prf?)>
+<!ATTLIST transmitter name CDATA #REQUIRED
+type (pulsed|continuous) #REQUIRED
+pulse CDATA #REQUIRED
+antenna CDATA #REQUIRED
+timing CDATA #REQUIRED>
+
+<!-- Standalone Receiver -->
+<!ELEMENT receiver (window_skip?,window_length?,prf?,noise_temp?)>
+<!ATTLIST receiver name CDATA #REQUIRED 
+antenna CDATA #REQUIRED
+timing CDATA #REQUIRED>
+<!ELEMENT window_skip (#PCDATA)> <!-- Time to skip after start of pulse before starting receiving (seconds) -->
+<!ELEMENT window_length (#PCDATA)> <!-- Length of the range gate (seconds) -->
+
+<!-- Target -->
+<!ELEMENT target (rcs)>
+<!ATTLIST target name CDATA #REQUIRED>
+<!ELEMENT rcs (value?)> <!-- Target RCS -->
+<!ATTLIST rcs type CDATA #REQUIRED>
+<!ELEMENT value (#PCDATA)>
+
+<!-- Multipath Surface -->
+<!ELEMENT multipath_surface (factor, nx, ny, nz, d)>
+<!ELEMENT factor (#PCDATA)>
+<!ELEMENT nx (#PCDATA)>
+<!ELEMENT ny (#PCDATA)>
+<!ELEMENT nz (#PCDATA)>
+<!ELEMENT d (#PCDATA)>
+
+<!-- Include another XML file -->
+<!ELEMENT include (#PCDATA)>
+
diff --git a/xml_schema/fers-xml.xsd b/xml_schema/fers-xml.xsd
new file mode 100644
index 0000000..b8dc520
--- /dev/null
+++ b/xml_schema/fers-xml.xsd
@@ -0,0 +1,385 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- DTD for FERS XML simulation script files. Script files must conform to this DTD or simulation results are likely to be unreliable. -->
+<!-- Marc Brooker mbrooker@rrsg.ee.uct.ac.za -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:element name="simulation">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="parameters"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="pulse"/>
+        <xs:element maxOccurs="unbounded" ref="timing"/>
+        <xs:element maxOccurs="unbounded" ref="antenna"/>
+        <xs:element maxOccurs="unbounded" ref="platform"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="include"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <!-- Simulation Parameters -->
+  <xs:element name="parameters">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="starttime"/>
+        <xs:element ref="endtime"/>
+        <xs:element minOccurs="0" ref="c"/>
+        <xs:element minOccurs="0" ref="interprate"/>
+        <xs:element minOccurs="0" ref="rate"/>
+        <xs:element minOccurs="0" ref="export"/>
+        <xs:element minOccurs="0" ref="adc_bits"/>
+        <xs:element minOccurs="0" ref="oversample"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="starttime" type="xs:string"/>
+  <!-- Start time of simulation -->
+  <xs:element name="endtime" type="xs:string"/>
+  <!-- End time of simulation -->
+  <xs:element name="c" type="xs:string"/>
+  <!-- Propagation speed -->
+  <xs:element name="interprate" type="xs:string"/>
+  <!-- Position interpolation rate for CW -->
+  <xs:element name="rate" type="xs:string"/>
+  <!-- Override the rendering sample rate with the specified one (Hz) -->
+  <xs:element name="randomseed" type="xs:string"/>
+  <!-- Random seed for noise and jitter (positive integer). If this is not specified, time() is used -->
+  <xs:element name="export">
+    <xs:complexType>
+      <xs:attribute name="xml" default="true">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="true"/>
+            <xs:enumeration value="false"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="csv" default="true">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="true"/>
+            <xs:enumeration value="false"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="binary" default="false">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="true"/>
+            <xs:enumeration value="false"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="csvbinary" default="false">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="true"/>
+            <xs:enumeration value="false"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <!-- Formats to export -->
+  <xs:element name="adc_bits" type="xs:string"/>
+  <!-- Optional -->
+  <xs:element name="oversample" type="xs:string"/>
+  <!-- Added* Optional -->
+  <!-- Pulsed Radar Pulse -->
+  <xs:element name="pulse">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="length"/>
+        <xs:element minOccurs="0" ref="rate"/>
+        <xs:element ref="power"/>
+        <xs:element ref="carrier"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+      <xs:attribute name="type" use="required"/>
+      <xs:attribute name="filename" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="length" type="xs:string"/>
+  <!-- Length of pulse (seconds) -->
+  <xs:element name="power" type="xs:string"/>
+  <!-- Pulse power (Watts) -->
+  <xs:element name="carrier" type="xs:string"/>
+  <!-- Frequency (Hz) -->
+  <!-- Timing Source -->
+  <!-- Added* 'alpha' changed to 'alpha1' because of error: duplicate declaration of element "alpha". -->
+  <xs:element name="timing">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="frequency"/>
+        <xs:element minOccurs="0" ref="freq_offset"/>
+        <xs:element minOccurs="0" ref="phase_offset"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+      <xs:attribute name="synconpulse" default="true">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="true"/>
+            <xs:enumeration value="false"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <!-- Timing source. Sets frequency and jitter -->
+  <!-- Name of the timing source -->
+  <xs:element name="frequency" type="xs:string"/>
+  <!-- Added* Required -->
+  <xs:element name="noise_entry">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="alpha1"/>
+        <xs:element ref="weight"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="alpha1" type="xs:string"/>
+  <!-- Noise category alpha1 -->
+  <xs:element name="weight" type="xs:string"/>
+  <!-- Weighting of noise in the category -->
+  <xs:element name="freq_offset" type="xs:string"/>
+  <!-- Offset from system frequency -->
+  <xs:element name="phase_offset" type="xs:string"/>
+  <!-- Added* [radians] Optional -->
+  <!-- Antenna -->
+  <!-- efficiency? added: Should this have been added? Was getting an error when defining it in other fersxml files -->
+  <xs:element name="antenna">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="alpha"/>
+        <xs:element minOccurs="0" ref="beta"/>
+        <xs:element minOccurs="0" ref="gamma"/>
+        <xs:element minOccurs="0" ref="diameter"/>
+        <xs:element minOccurs="0" ref="azscale"/>
+        <xs:element minOccurs="0" ref="elscale"/>
+        <xs:element minOccurs="0" ref="efficiency"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+      <xs:attribute name="pattern" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="alpha" type="xs:string"/>
+  <!-- Parameters of antenna model (see doc/equations.tex) -->
+  <xs:element name="beta" type="xs:string"/>
+  <xs:element name="gamma" type="xs:string"/>
+  <xs:element name="diameter" type="xs:string"/>
+  <xs:element name="azscale" type="xs:string"/>
+  <!-- Azimuth scale for Gaussian pattern -->
+  <xs:element name="elscale" type="xs:string"/>
+  <!-- Elevation scale for Gaussian pattern -->
+  <xs:element name="efficiency" type="xs:string"/>
+  <!-- The antenna efficiency factor (will be < 1 in all real-world cases) -->
+  <!-- Platform -->
+  <xs:element name="platform">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="motionpath"/>
+        <xs:choice>
+          <xs:element ref="rotationpath"/>
+          <xs:element ref="fixedrotation"/>
+        </xs:choice>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="monostatic"/>
+          <xs:element ref="transmitter"/>
+          <xs:element ref="receiver"/>
+        </xs:choice>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="target"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <!-- Motionpaths and Position Waypoints -->
+  <xs:element name="motionpath">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="positionwaypoint"/>
+      </xs:sequence>
+      <xs:attribute name="interpolation" default="static">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="static"/>
+            <xs:enumeration value="linear"/>
+            <xs:enumeration value="cubic"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="positionwaypoint">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="x"/>
+        <xs:element ref="y"/>
+        <xs:element ref="altitude"/>
+        <xs:element ref="time"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="x" type="xs:string"/>
+  <!-- x position of waypoint -->
+  <xs:element name="y" type="xs:string"/>
+  <!-- y position of waypoint -->
+  <xs:element name="altitude" type="xs:string"/>
+  <!-- z (altitude) position of waypoint -->
+  <xs:element name="time" type="xs:string"/>
+  <!-- Time the platform is at the waypoint -->
+  <!-- Constant Rate Rotation -->
+  <xs:element name="fixedrotation">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="startazimuth"/>
+        <xs:element ref="startelevation"/>
+        <xs:element ref="azimuthrate"/>
+        <xs:element ref="elevationrate"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="startazimuth" type="xs:string"/>
+  <!-- Azimuth at time 0 -->
+  <xs:element name="startelevation" type="xs:string"/>
+  <!-- Elevation at time 0 -->
+  <xs:element name="azimuthrate" type="xs:string"/>
+  <!-- Rate of change of azimuth -->
+  <xs:element name="elevationrate" type="xs:string"/>
+  <!-- Rate of change of elevation -->
+  <!-- Rotation Paths and Waypoints -->
+  <xs:element name="rotationpath">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="rotationwaypoint"/>
+      </xs:sequence>
+      <xs:attribute name="interpolation" use="required">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="linear"/>
+            <xs:enumeration value="cubic"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="rotationwaypoint">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="azimuth"/>
+        <xs:element ref="elevation"/>
+        <xs:element ref="time"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <!-- Waypoint along a rotation path -->
+  <xs:element name="azimuth" type="xs:string"/>
+  <xs:element name="elevation" type="xs:string"/>
+  <!-- Monostatic radar installations -->
+  <xs:element name="monostatic">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="window_skip"/>
+        <xs:element minOccurs="0" ref="window_length"/>
+        <xs:element minOccurs="0" ref="prf"/>
+        <xs:element minOccurs="0" ref="noise_temp"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+      <xs:attribute name="type" use="required">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="pulsed"/>
+            <xs:enumeration value="continuous"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="antenna" use="required"/>
+      <xs:attribute name="pulse" use="required"/>
+      <xs:attribute name="timing" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="prf" type="xs:string"/>
+  <!-- PRF required for pulse transmitters only -->
+  <xs:element name="noise_temp" type="xs:string"/>
+  <!-- Noise temperature contributed by receiver -->
+  <!-- Standalone Transmitter -->
+  <xs:element name="transmitter">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="prf"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+      <xs:attribute name="type" use="required">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="pulsed"/>
+            <xs:enumeration value="continuous"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="pulse" use="required"/>
+      <xs:attribute name="antenna" use="required"/>
+      <xs:attribute name="timing" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <!-- Standalone Receiver -->
+  <xs:element name="receiver">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="window_skip"/>
+        <xs:element minOccurs="0" ref="window_length"/>
+        <xs:element minOccurs="0" ref="prf"/>
+        <xs:element minOccurs="0" ref="noise_temp"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required"/>
+      <xs:attribute name="type" use="required"/>
+      <xs:attribute name="antenna" use="required"/>
+      <xs:attribute name="timing" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="window_skip" type="xs:string"/>
+  <!-- Time to skip after start of pulse before starting receiving (seconds) -->
+  <xs:element name="window_length" type="xs:string"/>
+  <!-- Length of the range gate (seconds) -->
+  <!-- Target -->
+  <xs:element name="target">
+    <xs:complexType>
+      <xs:complexContent>
+        <xs:extension base="rcs">
+          <xs:attribute name="name" use="required"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+  <xs:complexType name="rcs">
+    <xs:sequence>
+      <xs:element ref="rcs"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="rcs">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="value"/>
+      </xs:sequence>
+      <xs:attribute name="type" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <!-- Target RCS -->
+  <xs:element name="value" type="xs:string"/>
+  <!-- Multipath Surface -->
+  <xs:element name="multipath_surface">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="factor"/>
+        <xs:element ref="nx"/>
+        <xs:element ref="ny"/>
+        <xs:element ref="nz"/>
+        <xs:element ref="d"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="factor" type="xs:string"/>
+  <xs:element name="nx" type="xs:string"/>
+  <xs:element name="ny" type="xs:string"/>
+  <xs:element name="nz" type="xs:string"/>
+  <xs:element name="d" type="xs:string"/>
+  <!-- Include another XML file -->
+  <xs:element name="include" type="xs:string"/>
+</xs:schema>

From 188dca0dfff380e02f263b89661e916287abb758 Mon Sep 17 00:00:00 2001
From: Grabt234 <gnorrie12@gmail.com>
Date: Sat, 30 Mar 2024 23:15:23 +0200
Subject: [PATCH 3/5] Chore: more refactoring of parser

---
 config_validators/validator.cpp    | 209 +++++++++++++++--------------
 fers-xml.dtd                       | 121 -----------------
 test/regressionsuite/test1.fersxml |   2 +-
 test/regressionsuite/test2.fersxml |   2 +-
 test/regressionsuite/test3.fersxml |   2 +-
 test/regressionsuite/test4.fersxml |   2 +-
 test/regressionsuite/test5.fersxml |   2 +-
 test/regressionsuite/test6.fersxml |   2 +-
 test/test_cases/test1.fersxml      |   2 +-
 test/test_cases/test2.fersxml      |   2 +-
 test/test_cases/test3.fersxml      |   2 +-
 test/test_cases/test4.fersxml      |   2 +-
 test/test_cases/test5.fersxml      |   2 +-
 test/test_cases/test6.fersxml      |   2 +-
 test/test_cases/test7.fersxml      |   2 +-
 test/test_cases/test8.fersxml      |   2 +-
 16 files changed, 125 insertions(+), 233 deletions(-)
 delete mode 100644 fers-xml.dtd

diff --git a/config_validators/validator.cpp b/config_validators/validator.cpp
index 3f39f4e..0cd46ca 100644
--- a/config_validators/validator.cpp
+++ b/config_validators/validator.cpp
@@ -29,9 +29,10 @@ void printUsage(const std::string &programName)
 {
     std::cout << "Usage: " << programName << " [options] <arg1> <arg2> ...\n"
               << "Options:\n"
-              << "  -h, --help    Show this help message\n"
-              << "  -p, --path    fersxml file path (required)\n"
-              << "  -v, --verbose    run with verbose outputs (optional)\n";
+              << "  -h, --help      Show this help message\n"
+              << "  -p, --path      fersxml file path (required)\n"
+              << "  -s, --schema    fersxml.xsd schema location (requried)"
+              << "  -v, --verbose   run with verbose outputs (optional)\n";
 }
 
 // Error handler that catches validation errors and further provides information about the errors.
@@ -78,6 +79,7 @@ int main(int argc, char *argv[])
     try
     {
         std::string strFilePath = "";
+        std::string strFerXMLSchemaPath = "";
         bool bRunAsVerbose = false;
 
         // Parse command-line arguments
@@ -89,9 +91,15 @@ int main(int argc, char *argv[])
                 printUsage(argv[0]);
                 return 0;
             }
-            else if (arg == "-p" || arg == "--path")
+            else if (arg == "-c" || arg == "--config")
             {
                 strFilePath = argv[++i];
+                std::cout << "ferxml path set to: " << strFilePath << std::endl;
+            }
+            else if (arg == "-s" || arg == "--schema")
+            {
+                strFerXMLSchemaPath = argv[++i];
+                std::cout << "ferxml xsd path set to: " << strFerXMLSchemaPath << std::endl;
             }
             else if (arg == "-v" || arg == "--verbose")
             {
@@ -105,6 +113,11 @@ int main(int argc, char *argv[])
             std::cerr << "Error: no fersxml file given, run with -h\n";
             return 1;
         }
+        if (strFerXMLSchemaPath.empty())
+        {
+            std::cerr << "Error: no fersxml.xsd schema file given, run with -h\n";
+            return 1;
+        }
 
         // Initializing Xerces-C++ library:
         xercesc::XMLPlatformUtils::Initialize();
@@ -119,138 +132,138 @@ int main(int argc, char *argv[])
         parser.setDoSchema(true);
 
         // Set the custom XSD file for the parser by specifying the XSD file path and XSD file name
-        parser.setExternalNoNamespaceSchemaLocation("/Users/michaelaltshuler/Documents/5th Year/EEE4022F:Thesis/FERS Features/FERS Validator/FERS-schema/fers-xml.xsd");
+        std::cout << "Attempting to set xsd namespace: " + strFerXMLSchemaPath << std::endl;
+        parser.setExternalNoNamespaceSchemaLocation(strFerXMLSchemaPath.c_str());
+        std::cout << "Wohoo! Success!" << std::endl;
 
         // error handler instance created and set on the parser.
         MyErrorHandler errorHandler;
         parser.setErrorHandler(&errorHandler);
 
         // Establish a DOMDocument object and parse the input FERSXML file:
+        std::cout << "Attempting to parse" + strFilePath << std::endl;
         parser.parse(strFilePath.c_str());
-
-        cout << endl;
-
         if (parser.getErrorCount() == 0)
+            std::cout << "Wohoo! Success!" + strFilePath << std::endl;
+        else
         {
+            // error should have been printed by parser
+            std::cout << "XML parsing encountered errors - see above" << std::endl;
+            return 1;
+        }
 
-            std::cout << "XML document is valid" << std::endl;
+        std::cout << "XML document is valid" << std::endl;
 
-            // Command to run xml_validator_output with mode and strFilePath as argument
-            std::string command = "./xml_validator_output " + strFilePath;
-            // Run the command using system() function
-            int result = std::system(command.c_str());
+        // Command to run xml_validator_output with mode and strFilePath as argument
+        std::string command = "./xml_validator_output " + strFilePath;
+        // Run the command using system() function
+        int result = std::system(command.c_str());
 
-            if (result == -1)
-            {
-                std::cerr << "Failed to run xml_validator_output." << std::endl;
-                return 1;
-            }
+        if (result == -1)
+        {
+            std::cerr << "Failed to run xml_validator_output." << std::endl;
+            return 1;
+        }
 
-            std::cout << endl;
+        std::cout << endl;
 
-            // Prompting user whether they want to run the kml_visualiser
-            char run_kml_visualiser = 'n';
-            char custom_coordinates;
-            double referenceLatitude = -33.9545;
-            double referenceLongitude = 18.4563;
-            double referenceAltitude = 0;
-            std::string outputName;
-            std::string input;
+        // Prompting user whether they want to run the kml_visualiser
+        char run_kml_visualiser = 'n';
+        char custom_coordinates;
+        double referenceLatitude = -33.9545;
+        double referenceLongitude = 18.4563;
+        double referenceAltitude = 0;
+        std::string outputName;
+        std::string input;
 
-            std::cout << "Do you want to run the kml_visualiser program? (y/N): ";
-            std::getline(std::cin, input);
+        std::cout << "Do you want to run the kml_visualiser program? (y/N): ";
+        std::getline(std::cin, input);
+
+        if (!input.empty())
+        {
+            run_kml_visualiser = input[0];
+        }
 
-            if (!input.empty())
+        if (run_kml_visualiser == 'y' || run_kml_visualiser == 'Y')
+        {
+            std::cout << "Name a KML output file (defualt file name = file name of fersxml): ";
+            std::getline(std::cin, outputName);
+
+            if (outputName.empty())
             {
-                run_kml_visualiser = input[0];
+                outputName = getFileNameFromPath(strFilePath);
             }
 
-            if (run_kml_visualiser == 'y' || run_kml_visualiser == 'Y')
+            std::cout << "Do you want to enter custom referenceLatitude, referenceLongitude, and referenceAltitude? (y/N): ";
+            input.clear();
+            std::getline(std::cin, input);
+            custom_coordinates = input.empty() ? 'n' : input[0];
+            std::cout << "Default coordinates set to University of Cape Town: <133.9577° S, 18.4612° E, 0>" << std::endl;
+
+            if (custom_coordinates == 'y' || custom_coordinates == 'Y')
             {
-                std::cout << "Name a KML output file (defualt file name = file name of fersxml): ";
-                std::getline(std::cin, outputName);
+                std::string input;
 
-                if (outputName.empty())
+                std::cout << "Enter referenceLatitude (default: -33.9545): ";
+                std::cin >> input;
+                std::istringstream iss_latitude(input);
+                if (!(iss_latitude >> referenceLatitude))
                 {
-                    outputName = getFileNameFromPath(strFilePath);
+                    std::cerr << "Invalid input. Please enter a valid number for referenceLatitude." << std::endl;
+                    return 1;
                 }
 
-                std::cout << "Do you want to enter custom referenceLatitude, referenceLongitude, and referenceAltitude? (y/N): ";
-                input.clear();
-                std::getline(std::cin, input);
-                custom_coordinates = input.empty() ? 'n' : input[0];
-                std::cout << "Default coordinates set to University of Cape Town: <133.9577° S, 18.4612° E, 0>" << std::endl;
+                std::cout << "Enter referenceLongitude (default: 18.4563): ";
+                std::cin >> input;
+                std::istringstream iss_longitude(input);
+                if (!(iss_longitude >> referenceLongitude))
+                {
+                    std::cerr << "Invalid input. Please enter a valid number for referenceLongitude." << std::endl;
+                    return 1;
+                }
 
-                if (custom_coordinates == 'y' || custom_coordinates == 'Y')
+                std::cout << "Enter referenceAltitude (default: 0): ";
+                std::cin >> input;
+                std::istringstream iss_altitude(input);
+                if (!(iss_altitude >> referenceAltitude))
                 {
-                    std::string input;
-
-                    std::cout << "Enter referenceLatitude (default: -33.9545): ";
-                    std::cin >> input;
-                    std::istringstream iss_latitude(input);
-                    if (!(iss_latitude >> referenceLatitude))
-                    {
-                        std::cerr << "Invalid input. Please enter a valid number for referenceLatitude." << std::endl;
-                        return 1;
-                    }
-
-                    std::cout << "Enter referenceLongitude (default: 18.4563): ";
-                    std::cin >> input;
-                    std::istringstream iss_longitude(input);
-                    if (!(iss_longitude >> referenceLongitude))
-                    {
-                        std::cerr << "Invalid input. Please enter a valid number for referenceLongitude." << std::endl;
-                        return 1;
-                    }
-
-                    std::cout << "Enter referenceAltitude (default: 0): ";
-                    std::cin >> input;
-                    std::istringstream iss_altitude(input);
-                    if (!(iss_altitude >> referenceAltitude))
-                    {
-                        std::cerr << "Invalid input. Please enter a valid number for referenceAltitude." << std::endl;
-                        return 1;
-                    }
+                    std::cerr << "Invalid input. Please enter a valid number for referenceAltitude." << std::endl;
+                    return 1;
                 }
+            }
 
-                std::string kml_visualiser_command = "./kml_visualiser";
+            std::string kml_visualiser_command = "./kml_visualiser";
 
-                if (custom_coordinates == 'y' || custom_coordinates == 'Y')
-                {
-                    kml_visualiser_command += " " + strFilePath + " " + outputName + ".kml" + " " + std::to_string(referenceLatitude) + " " + std::to_string(referenceLongitude) + " " + std::to_string(referenceAltitude);
+            if (custom_coordinates == 'y' || custom_coordinates == 'Y')
+            {
+                kml_visualiser_command += " " + strFilePath + " " + outputName + ".kml" + " " + std::to_string(referenceLatitude) + " " + std::to_string(referenceLongitude) + " " + std::to_string(referenceAltitude);
 
-                    int kml_visualiser_result = std::system(kml_visualiser_command.c_str());
+                int kml_visualiser_result = std::system(kml_visualiser_command.c_str());
 
-                    if (kml_visualiser_result == -1)
-                    {
-                        std::cerr << "Failed to run kml_visualiser." << std::endl;
-                        return 1;
-                    }
-                }
-                else
+                if (kml_visualiser_result == -1)
                 {
-                    kml_visualiser_command += " " + strFilePath + " " + outputName + ".kml";
-                    int kml_visualiser_result = std::system(kml_visualiser_command.c_str());
-
-                    if (kml_visualiser_result == -1)
-                    {
-                        std::cerr << "Failed to run kml_visualiser." << std::endl;
-                        return 1;
-                    }
+                    std::cerr << "Failed to run kml_visualiser." << std::endl;
+                    return 1;
                 }
-
-                std::cout << outputName + ".kml" + " outputted to current working directory." << std::endl;
             }
-            else if (run_kml_visualiser != 'n' && run_kml_visualiser != 'N')
+            else
             {
-                std::cerr << "Invalid input. Please enter 'y' for yes or 'n' for no." << std::endl;
-                return 1;
+                kml_visualiser_command += " " + strFilePath + " " + outputName + ".kml";
+                int kml_visualiser_result = std::system(kml_visualiser_command.c_str());
+
+                if (kml_visualiser_result == -1)
+                {
+                    std::cerr << "Failed to run kml_visualiser." << std::endl;
+                    return 1;
+                }
             }
-        }
 
-        else
+            std::cout << outputName + ".kml" + " outputted to current working directory." << std::endl;
+        }
+        else if (run_kml_visualiser != 'n' && run_kml_visualiser != 'N')
         {
-            std::cout << "FERSXML invalid: Take note of given errors and warnings above." << std::endl;
+            std::cerr << "Invalid input. Please enter 'y' for yes or 'n' for no." << std::endl;
+            return 1;
         }
 
         // Function call deallocates memory associated with he parsed FERSXML document.
diff --git a/fers-xml.dtd b/fers-xml.dtd
deleted file mode 100644
index 09400cd..0000000
--- a/fers-xml.dtd
+++ /dev/null
@@ -1,121 +0,0 @@
-<!-- DTD for FERS XML simulation script files. Script files must conform to this DTD or simulation results are likely to be unreliable. -->
-<!-- Marc Brooker mbrooker@rrsg.ee.uct.ac.za -->
-<!ELEMENT simulation (parameters,pulse*,waveform*,timing+,antenna+,platform+,include*)>
-<!ATTLIST simulation name CDATA #REQUIRED>
-
-<!-- Simulation Parameters -->
-<!ELEMENT parameters (starttime,endtime,c?,interprate?,rate?,export?,adcbits?)>
-<!ELEMENT starttime (#PCDATA)> <!-- Start time of simulation -->
-<!ELEMENT endtime (#PCDATA)> <!-- End time of simulation -->
-<!ELEMENT c (#PCDATA)> <!-- Propagation speed -->
-<!ELEMENT interprate (#PCDATA)> <!-- Position interpolation rate for CW -->
-<!ELEMENT rate (#PCDATA)> <!-- Override the rendering sample rate with the specified one (Hz) -->
-<!ELEMENT randomseed (#PCDATA)> <!-- Random seed for noise and jitter (positive integer). If this is not specified, time() is used -->
-<!ELEMENT export EMPTY> <!-- Formats to export -->
-<!ATTLIST export xml (true|false) "true">
-<!ATTLIST export csv (true|false) "true"> 
-<!ATTLIST export binary (true|false) "false">
-<!ATTLIST export csvbinary (true|false) "false">
-<!ELEMENT adcbits #PCDATA>
-
-<!-- Pulsed Radar Pulse -->
-<!ELEMENT pulse (length?,rate?,power,carrier)>
-<!ATTLIST pulse name CDATA #REQUIRED
-type CDATA #REQUIRED
-filename CDATA #REQUIRED>
-<!ELEMENT length (#PCDATA)> <!-- Length of pulse (seconds) -->
-<!ELEMENT power (#PCDATA)> <!-- Pulse power (Watts) -->
-<!ELEMENT carrier (#PCDATA)> <!-- Frequency (Hz) -->
-
-<!-- Timing Source -->
-<!ELEMENT timing (frequency,jitter,freq_offset?)> <!-- Timing source. Sets frequency and jitter -->
-<!ATTLIST timing name CDATA #REQUIRED
-synconpulse (true|false) "true"> <!-- Name of the timing source -->
-<!ELEMENT noise_entry (alpha,weight)> 
-<!ELEMENT alpha (#PCDATA)> <!-- Noise category alpha -->
-<!ELEMENT weight (#PCDATA)> <!-- Weighting of noise in the category -->
-<!ELEMENT freq_offset (#PCDATA)> <!-- Offset from system frequency -->
-
-<!-- Antenna -->
-<!ELEMENT antenna (alpha?,beta?,gamma?,diameter?,azscale?,elscale?)>
-<!ATTLIST antenna name CDATA #REQUIRED
-pattern CDATA #REQUIRED>
-<!ELEMENT alpha (#PCDATA)> <!-- Parameters of antenna model (see doc/equations.tex) -->
-<!ELEMENT beta (#PCDATA)>
-<!ELEMENT gamma (#PCDATA)>
-<!ELEMENT diameter (#PCDATA)>
-<!ELEMENT azscale (#PCDATA)> <!-- Azimuth scale for Gaussian pattern -->
-<!ELEMENT elscale (#PCDATA)> <!-- Elevation scale for Gaussian pattern -->
-<!ELEMENT efficiency (#PCDATA)> <!-- The antenna efficiency factor (will be < 1 in all real-world cases) -->
-
-<!-- Platform -->
-<!ELEMENT platform (motionpath,(rotationpath|fixedrotation),(monostatic|transmitter|receiver)*,target*)>
-<!ATTLIST platform name CDATA #REQUIRED>
-
-<!-- Motionpaths and Position Waypoints -->
-<!ELEMENT motionpath (positionwaypoint+)>
-<!ATTLIST motionpath interpolation (static|linear|cubic) "static">
-<!ELEMENT positionwaypoint (x,y,altitude,time)>
-<!ELEMENT x (#PCDATA)> <!-- x position of waypoint -->
-<!ELEMENT y (#PCDATA)> <!-- y position of waypoint -->
-<!ELEMENT altitude (#PCDATA)> <!-- z (altitude) position of waypoint -->
-<!ELEMENT time (#PCDATA)> <!-- Time the platform is at the waypoint -->
-
-<!-- Constant Rate Rotation -->
-<!ELEMENT fixedrotation (startazimuth,startelevation,azimuthrate,elevationrate)>
-<!ELEMENT startazimuth (#PCDATA)> <!-- Azimuth at time 0 -->
-<!ELEMENT startelevation (#PCDATA)> <!-- Elevation at time 0 -->
-<!ELEMENT azimuthrate (#PCDATA)> <!-- Rate of change of azimuth -->
-<!ELEMENT elevationrate (#PCDATA)> <!-- Rate of change of elevation -->
-
-<!-- Rotation Paths and Waypoints -->
-<!ELEMENT rotationpath (rotationwaypoint+)>
-<!ATTLIST rotationpath interpolation (linear|cubic) #REQUIRED>
-<!ELEMENT rotationwaypoint (azimuth,elevation,time)> <!-- Waypoint along a rotation path -->
-<!ELEMENT azimuth (#PCDATA)>
-<!ELEMENT elevation (#PCDATA)>
-
-<!-- Monostatic radar installations -->
-<!ELEMENT monostatic (window_skip?,window_length?,prf?,noise_temp?)>
-<!ATTLIST monostatic name CDATA #REQUIRED
-type (pulsed|continuous) #REQUIRED
-antenna CDATA #REQUIRED
-pulse CDATA #REQUIRED
-timing CDATA #REQUIRED>
-<!ELEMENT prf (#PCDATA)> <!-- PRF required for pulse transmitters only -->
-<!ELEMENT noise_temp (#PCDATA)> <!-- Noise temperature contributed by receiver -->
-
-<!-- Standalone Transmitter -->
-<!ELEMENT transmitter (prf?)>
-<!ATTLIST transmitter name CDATA #REQUIRED
-type (pulsed|continuous) #REQUIRED
-pulse CDATA #REQUIRED
-antenna CDATA #REQUIRED
-timing CDATA #REQUIRED>
-
-<!-- Standalone Receiver -->
-<!ELEMENT receiver (window_skip?,window_length?,prf?,noise_temp?)>
-<!ATTLIST receiver name CDATA #REQUIRED 
-antenna CDATA #REQUIRED
-timing CDATA #REQUIRED>
-<!ELEMENT window_skip (#PCDATA)> <!-- Time to skip after start of pulse before starting receiving (seconds) -->
-<!ELEMENT window_length (#PCDATA)> <!-- Length of the range gate (seconds) -->
-
-<!-- Target -->
-<!ELEMENT target (rcs)>
-<!ATTLIST target name CDATA #REQUIRED>
-<!ELEMENT rcs (value?)> <!-- Target RCS -->
-<!ATTLIST rcs type CDATA #REQUIRED>
-<!ELEMENT value (#PCDATA)>
-
-<!-- Multipath Surface -->
-<!ELEMENT multipath_surface (factor, nx, ny, nz, d)>
-<!ELEMENT factor (#PCDATA)>
-<!ELEMENT nx (#PCDATA)>
-<!ELEMENT ny (#PCDATA)>
-<!ELEMENT nz (#PCDATA)>
-<!ELEMENT d (#PCDATA)>
-
-<!-- Include another XML file -->
-<!ELEMENT include (#PCDATA)>
-
diff --git a/test/regressionsuite/test1.fersxml b/test/regressionsuite/test1.fersxml
index cbbf556..0e671f5 100644
--- a/test/regressionsuite/test1.fersxml
+++ b/test/regressionsuite/test1.fersxml
@@ -1,6 +1,6 @@
 <!-- Test pulsed radar. One Monostatic radar and one target -->
 <?xml version="1.0" ?>
-<!DOCTYPE simulation SYSTEM "../../fers-xml.dtd">
+<!DOCTYPE simulation SYSTEM "../../xml_schema/fers-xml.dtd">
 <simulation name="sim1">
   <parameters>
     <starttime>0</starttime>
diff --git a/test/regressionsuite/test2.fersxml b/test/regressionsuite/test2.fersxml
index 9545d61..dbda54c 100644
--- a/test/regressionsuite/test2.fersxml
+++ b/test/regressionsuite/test2.fersxml
@@ -1,6 +1,6 @@
 <!-- Test pulsed radar. One Monostatic radar and one moving target -->
 <?xml version="1.0" ?>
-<!DOCTYPE simulation SYSTEM "../../fers-xml.dtd">
+<!DOCTYPE simulation SYSTEM "../../xml_schema/fers-xml.dtd">
 <simulation name="sim1">
   <parameters>
     <starttime>0</starttime>
diff --git a/test/regressionsuite/test3.fersxml b/test/regressionsuite/test3.fersxml
index 2c609de..76c85c5 100644
--- a/test/regressionsuite/test3.fersxml
+++ b/test/regressionsuite/test3.fersxml
@@ -1,6 +1,6 @@
 <!-- Test pulsed radar. One Monostatic radar and one moving target -->
 <?xml version="1.0" ?>
-<!DOCTYPE simulation SYSTEM "../../fers-xml.dtd">
+<!DOCTYPE simulation SYSTEM "../../xml_schema/fers-xml.dtd">
 <simulation name="sim1">
   <parameters>
     <starttime>0</starttime>
diff --git a/test/regressionsuite/test4.fersxml b/test/regressionsuite/test4.fersxml
index 7effa43..0824d24 100644
--- a/test/regressionsuite/test4.fersxml
+++ b/test/regressionsuite/test4.fersxml
@@ -1,6 +1,6 @@
 <!-- Test bistatic radar. One receiver, one transmitter and a moving target. -->
 <?xml version="1.0" ?>
-<!DOCTYPE simulation SYSTEM "../../fers-xml.dtd">
+<!DOCTYPE simulation SYSTEM "../../xml_schema/fers-xml.dtd">
 <simulation name="sim1">
   <parameters>
     <starttime>0</starttime>
diff --git a/test/regressionsuite/test5.fersxml b/test/regressionsuite/test5.fersxml
index 386daf5..2175128 100644
--- a/test/regressionsuite/test5.fersxml
+++ b/test/regressionsuite/test5.fersxml
@@ -2,7 +2,7 @@
 <!-- Marc Brooker mbrooker@rrsg.ee.uct.ac.za -->
 
 <?xml version="1.0" ?>
-<!DOCTYPE simulation SYSTEM "../../fers-xml.dtd">
+<!DOCTYPE simulation SYSTEM "../../xml_schema/fers-xml.dtd">
 <simulation name="sim1">
   <parameters>
     <starttime>0</starttime>
diff --git a/test/regressionsuite/test6.fersxml b/test/regressionsuite/test6.fersxml
index 61b6479..ad8a4ad 100644
--- a/test/regressionsuite/test6.fersxml
+++ b/test/regressionsuite/test6.fersxml
@@ -2,7 +2,7 @@
 <!-- Marc Brooker mbrooker@rrsg.ee.uct.ac.za -->
 
 <?xml version="1.0" ?>
-<!DOCTYPE simulation SYSTEM "../../fers-xml.dtd">
+<!DOCTYPE simulation SYSTEM "../../xml_schema/fers-xml.dtd">
 <simulation name="sim1">
   <parameters>
     <starttime>0</starttime>
diff --git a/test/test_cases/test1.fersxml b/test/test_cases/test1.fersxml
index 626ca51..cb6e289 100644
--- a/test/test_cases/test1.fersxml
+++ b/test/test_cases/test1.fersxml
@@ -1,6 +1,6 @@
 <!-- Test pulsed radar. One Monostatic radar and one target -->
 <?xml version="1.0" ?>
-<!DOCTYPE simulation SYSTEM "../../fers-xml.dtd">
+<!DOCTYPE simulation SYSTEM "../../xml_schema/fers-xml.dtd">
 <simulation name="sim1">
   <parameters>
     <starttime>0</starttime> <!-- Simulation start time -->
diff --git a/test/test_cases/test2.fersxml b/test/test_cases/test2.fersxml
index c64bfb2..7fb87cb 100644
--- a/test/test_cases/test2.fersxml
+++ b/test/test_cases/test2.fersxml
@@ -1,6 +1,6 @@
 <!-- Test pulsed radar. One Monostatic radar and one moving target -->
 <?xml version="1.0" ?>
-<!DOCTYPE simulation SYSTEM "../../fers-xml.dtd">
+<!DOCTYPE simulation SYSTEM "../../xml_schema/fers-xml.dtd">
 <simulation name="sim1">
   <parameters>
     <starttime>0</starttime>
diff --git a/test/test_cases/test3.fersxml b/test/test_cases/test3.fersxml
index 2c609de..76c85c5 100644
--- a/test/test_cases/test3.fersxml
+++ b/test/test_cases/test3.fersxml
@@ -1,6 +1,6 @@
 <!-- Test pulsed radar. One Monostatic radar and one moving target -->
 <?xml version="1.0" ?>
-<!DOCTYPE simulation SYSTEM "../../fers-xml.dtd">
+<!DOCTYPE simulation SYSTEM "../../xml_schema/fers-xml.dtd">
 <simulation name="sim1">
   <parameters>
     <starttime>0</starttime>
diff --git a/test/test_cases/test4.fersxml b/test/test_cases/test4.fersxml
index 7effa43..0824d24 100644
--- a/test/test_cases/test4.fersxml
+++ b/test/test_cases/test4.fersxml
@@ -1,6 +1,6 @@
 <!-- Test bistatic radar. One receiver, one transmitter and a moving target. -->
 <?xml version="1.0" ?>
-<!DOCTYPE simulation SYSTEM "../../fers-xml.dtd">
+<!DOCTYPE simulation SYSTEM "../../xml_schema/fers-xml.dtd">
 <simulation name="sim1">
   <parameters>
     <starttime>0</starttime>
diff --git a/test/test_cases/test5.fersxml b/test/test_cases/test5.fersxml
index 386daf5..2175128 100644
--- a/test/test_cases/test5.fersxml
+++ b/test/test_cases/test5.fersxml
@@ -2,7 +2,7 @@
 <!-- Marc Brooker mbrooker@rrsg.ee.uct.ac.za -->
 
 <?xml version="1.0" ?>
-<!DOCTYPE simulation SYSTEM "../../fers-xml.dtd">
+<!DOCTYPE simulation SYSTEM "../../xml_schema/fers-xml.dtd">
 <simulation name="sim1">
   <parameters>
     <starttime>0</starttime>
diff --git a/test/test_cases/test6.fersxml b/test/test_cases/test6.fersxml
index 61b6479..ad8a4ad 100644
--- a/test/test_cases/test6.fersxml
+++ b/test/test_cases/test6.fersxml
@@ -2,7 +2,7 @@
 <!-- Marc Brooker mbrooker@rrsg.ee.uct.ac.za -->
 
 <?xml version="1.0" ?>
-<!DOCTYPE simulation SYSTEM "../../fers-xml.dtd">
+<!DOCTYPE simulation SYSTEM "../../xml_schema/fers-xml.dtd">
 <simulation name="sim1">
   <parameters>
     <starttime>0</starttime>
diff --git a/test/test_cases/test7.fersxml b/test/test_cases/test7.fersxml
index f24d11d..bf6bbb9 100644
--- a/test/test_cases/test7.fersxml
+++ b/test/test_cases/test7.fersxml
@@ -1,6 +1,6 @@
 <!-- Test CW radar. One Monostatic radar and one moving target -->
 <?xml version="1.0" ?>
-<!DOCTYPE simulation SYSTEM "../../fers-xml.dtd">
+<!DOCTYPE simulation SYSTEM "../../xml_schema/fers-xml.dtd">
 <simulation name="sim1">
   <parameters>
     <starttime>0</starttime>
diff --git a/test/test_cases/test8.fersxml b/test/test_cases/test8.fersxml
index 61f1936..6cf6830 100644
--- a/test/test_cases/test8.fersxml
+++ b/test/test_cases/test8.fersxml
@@ -1,6 +1,6 @@
 <!-- Test bistatic CW radar. One receiver, one transmitter and a moving target. -->
 <?xml version="1.0" ?>
-<!DOCTYPE simulation SYSTEM "../../fers-xml.dtd">
+<!DOCTYPE simulation SYSTEM "../../xml_schema/fers-xml.dtd">
 <simulation name="sim1">
   <parameters>
     <starttime>0</starttime>

From 88e736c20abc7c0f9970f324353bf9cdf9d842fd Mon Sep 17 00:00:00 2001
From: Grabt234 <gnorrie12@gmail.com>
Date: Sat, 30 Mar 2024 23:28:12 +0200
Subject: [PATCH 4/5] Feat: update for workflow

---
 .github/workflows/CMake.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/CMake.yml b/.github/workflows/CMake.yml
index d566fac..fa4ac65 100644
--- a/.github/workflows/CMake.yml
+++ b/.github/workflows/CMake.yml
@@ -13,6 +13,9 @@ jobs:
       with:
         submodules: recursive
         
+    - name: Update
+      run: apt-get update 
+
     - name: Install Requried Libs for FERS
       run: sudo apt-get install libboost-all-dev libfftw3-dev libhdf5-dev libhdf5-serial-dev build-essential cmake cmake-qt-gui python-all-dev libtinyxml-dev
 

From 2128ef90360c55587f99f50084bf4f7e7349d9b5 Mon Sep 17 00:00:00 2001
From: Grabt234 <gnorrie12@gmail.com>
Date: Sat, 30 Mar 2024 23:29:13 +0200
Subject: [PATCH 5/5] Feat: update for workflow

---
 .github/workflows/CMake.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CMake.yml b/.github/workflows/CMake.yml
index fa4ac65..dd84586 100644
--- a/.github/workflows/CMake.yml
+++ b/.github/workflows/CMake.yml
@@ -14,7 +14,7 @@ jobs:
         submodules: recursive
         
     - name: Update
-      run: apt-get update 
+      run: sudo apt-get update 
 
     - name: Install Requried Libs for FERS
       run: sudo apt-get install libboost-all-dev libfftw3-dev libhdf5-dev libhdf5-serial-dev build-essential cmake cmake-qt-gui python-all-dev libtinyxml-dev