Merge pull request #23 from Grabt234/refactors

Refactors
stpaine · Apr 2, 2024 · 526d412 · 526d412
2 parents 90269bd + 2128ef9
commit 526d412
Show file tree

Hide file tree

Showing 19 changed files with 604 additions and 157 deletions.
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 [email protected] -->
 
 <?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 [email protected] -->
 
 <?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 [email protected] -->
 
 <?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 [email protected] -->
 
 <?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/fers-xml.dtd → xml_schema/fers-xml.dtd b/fers-xml.dtd → xml_schema/fers-xml.dtd