Merge pull request stpaine#23 from Grabt234/refactors

stpaine · web-flow · commit 526d412cbe06 · 2024-04-02T10:18:00.000+02:00
Refactors
diff --git a/.github/workflows/CMake.yml b/.github/workflows/CMake.yml
@@ -13,6 +13,9 @@ jobs:
       with:
         submodules: recursive
         
+    - name: 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
 
diff --git a/config_validators/validator.cpp b/config_validators/validator.cpp
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>
diff --git a/xml_schema/README.md 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
diff --git a/xml_schema/fers-xml.dtd b/xml_schema/fers-xml.dtd
diff --git a/xml_schema/fers-xml.xsd b/xml_schema/fers-xml.xsd
