restructure all files

Author: cvogt729

.gitignore

@@ -0,0 +1,2 @@
+**/*.jar
+test.html

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "java.project.referencedLibraries": [
+    "lib\\**\\*.jar"
+  ]
+}

DEPENDENCIES

@@ -0,0 +1,3 @@
+file:tomcat-embed-core:webserver\lib
+url:CommissioningScripts-0.1.1.jar:https://github.com/automatic-controls/commissioning-scripts/releases/download/v0.1.1-beta/CommissioningScripts-0.1.1.jar
+url:CommissioningScripts-0.1.1-sources.jar:https://github.com/automatic-controls/commissioning-scripts/releases/download/v0.1.1-beta/CommissioningScripts-0.1.1-sources.jar

README.md

@@ -98,12 +98,12 @@ The remaining three error messages are thrown during the data analysis phase. Wh
 
 ### Sample Output
 
-![](./report1.png)
-![](./report2.png)
+![](./resources/report1.png)
+![](./resources/report2.png)
 
 ## Mappings
 
-Control programs with dampers should be grouped by air source. By limiting the percentage of active tests per group, we can avoid tripping the high static safety alarm on the RTU air source (for a worst case scenario, imagine all VAV dampers locked to 0% while the RTU supply fan is still pumping air into the system). If there are hot water valves, you should also consider grouping by water source. See the following table for a list of mapping tags for this script. Also see [./tags.json](./tags.json) for the tag mappings I used while testing this script.
+Control programs with dampers should be grouped by air source. By limiting the percentage of active tests per group, we can avoid tripping the high static safety alarm on the RTU air source (for a worst case scenario, imagine all VAV dampers locked to 0% while the RTU supply fan is still pumping air into the system). If there are hot water valves, you should also consider grouping by water source. See the following table for a list of mapping tags for this script. Also see [./resources/tags.json](./resources/tags.json) for the tag mappings I used while testing this script.
 
 | Semantic Tag | Sample Expression | Description |
 | - | - | - |

TerminalUnitTest.jar

@@ -1,26 +1,106 @@
 @echo off
+setlocal EnableDelayedExpansion
 echo.
-set "jdk=C:\Program Files\Java\jdk-17.0.2\bin"
-set "classes=%~dp0classes"
+
+:: Modify these parameters when necessary
+set "WebCTRL=C:\WebCTRL8.0"
 set "mainClass=TerminalUnitTest"
+set "package="
+set "jdk=%JAVA_HOME%\bin"
+set "release=8"
+
+if not exist "%~dp0lib" mkdir "%~dp0lib" >nul 2>nul
+call :collect "%~dp0DEPENDENCIES" "%~dp0lib"
+if %ERRORLEVEL% NEQ 0 (
+  echo Failed to collect necessary dependencies.
+  echo Press any key to exit.
+  pause >nul
+  exit
+)
+set "classes=%~dp0classes"
 if exist "%classes%" rmdir /S /Q "%classes%" >nul
 if exist "%~dp0%mainClass%.jar" del /F "%~dp0%mainClass%.jar" >nul
 mkdir "%classes%" >nul
-"%jdk%\javac.exe" --release 8 -d "%classes%" --class-path "%~dp0src;C:\Users\cvogt\Desktop\Repositories\commissioning-scripts\CommissioningScripts.jar;C:\Users\cvogt\Desktop\Repositories\addon-dev-script\lib\*;C:\Users\cvogt\Desktop\Repositories\commissioning-scripts\lib\*" "%~dp0src\%mainClass%.java"
+echo Compiling...
+"%jdk%\javac.exe" --release %release% -d "%classes%" --class-path "%~dp0src;%~dp0lib\*" "%~dp0src\%package%%mainClass%.java"
 if %ERRORLEVEL% NEQ 0 (
   rmdir /S /Q "%classes%" >nul
   echo.
+  echo Compilation failed.
   echo Press any key to exit.
   pause >nul
   exit
 )
-"%jdk%\jar.exe" --create --verbose --file "%~dp0%mainClass%.jar" --main-class "%mainClass%" -C "%classes%" . >nul
+echo Packing...
+robocopy /E "%~dp0src" "%classes%" /XF "*.java" >nul 2>nul
+if exist "%~dp0%mainClass%.jar" del /F "%~dp0%mainClass%.jar" >nul 2>nul
+"%jdk%\jar.exe" --create --verbose --file "%~dp0%mainClass%.jar" --main-class "%package%%mainClass%" -C "%classes%" . >nul
 if %ERRORLEVEL% NEQ 0 (
   rmdir /S /Q "%classes%" >nul
   echo.
+  echo Jar creation failed.
   echo Press any key to exit.
   pause >nul
   exit
 )
 rmdir /S /Q "%classes%" >nul
-exit
+echo Build successful.
+echo Press any key to exit.
+pause >nul
+exit
+
+
+:: Collect dependencies from the WebCTRL installation or from external websites
+:: Parameters: <dependency-file> <output-folder>
+:collect
+  setlocal
+    set "tmp1=%~dp0tmp1"
+    set "tmp2=%~dp0tmp2"
+    set "err=0"
+    set "msg=0"
+    dir "%~f2\*.jar" /B /A-D 2>nul >"%tmp1%"
+    for /F "usebackq tokens=1,2,* delims=:" %%i in ("%~f1") do (
+      set "findString=%%j"
+      if "!findString:~-4!" NEQ ".jar" set "findString=%%j-[0-9].*"
+      set "exists=0"
+      for /F %%a in ('findstr /R /X "!findString!" "%tmp1%"') do (
+        set "exists=1"
+      )
+      if "!exists!" EQU "0" (
+        set "msg=1"
+        if /I "%%i" EQU "url" (
+          curl --location --fail --silent --output-dir "%~f2" --remote-name %%k
+          if !ErrorLevel! EQU 0 (
+            echo Collected: %%j
+          ) else (
+            set "err=1"
+            echo Failed to collect: %%j
+          )
+        ) else if /I "%%i" EQU "file" (
+          set "file="
+          dir "%WebCTRL%\%%k\*.jar" /B /A-D 2>nul >"%tmp2%"
+          for /F %%a in ('findstr /R /X "!findString!" "%tmp2%"') do (
+            set "file=%%a"
+          )
+          if "!file!" EQU "" (
+            set "err=1"
+            echo Failed to collect: %%j
+          ) else (
+            copy /Y "%WebCTRL%\%%k\!file!" "%~f2\!file!" >nul
+            if !ErrorLevel!==0 (
+              echo Collected: %%j
+            ) else (
+              set "err=1"
+              echo Failed to collect: %%j
+            )
+          )
+        ) else (
+          set "err=1"
+          echo Failed to collect: %%j
+        )
+      )
+    )
+    if "%msg%" EQU "1" echo.
+    if exist "%tmp1%" del /F "%tmp1%" >nul 2>nul
+    if exist "%tmp2%" del /F "%tmp2%" >nul 2>nul
+  endlocal & exit /b %err%

build.bat

@@ -24,9 +24,9 @@ public class TerminalUnitTest extends Script {
   @Override public void init(){
     data = new Data[this.testsTotal];
     Arrays.fill(data,null);
-    testDampers = (Boolean)this.params.getOrDefault("Dampers",false);
-    testFans = (Boolean)this.params.getOrDefault("Fans",false);
-    testHeating = (Boolean)this.params.getOrDefault("Heating",false);
+    testDampers = this.params.getOrDefault("Dampers",false);
+    testFans = this.params.getOrDefault("Fans",false);
+    testHeating = this.params.getOrDefault("Heating",false);
     initialized = true;
   }
   @Override public void exec(ResolvedTestingUnit x) throws Throwable {
@@ -615,7 +615,7 @@ private void printData(final StringBuilder sb, final boolean JSON){
           }else{
             sb.append("\n]\n},\n");
           }
-          sb.append(Utility.format("{\n\"name\":\"$0\",\n\"equipment\":[\n", escape(JSON,(String)this.mapping.groupNames.getOrDefault(group,"(Deleted Group)"))));
+          sb.append(Utility.format("{\n\"name\":\"$0\",\n\"equipment\":[\n", escape(JSON,this.mapping.groupNames.getOrDefault(group,"(Deleted Group)"))));
         }
         d.print(sb,JSON);
       }
@@ -625,7 +625,8 @@ private void printData(final StringBuilder sb, final boolean JSON){
   private static String escape(boolean JSON, String s){
     return JSON?Utility.escapeJSON(s):Utility.escapeJS(s);
   }
-  class Data implements Comparable<Object> {
+  public final static int[] airflowX = new int[]{0,5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,100};
+  class Data implements Comparable<Data> {
     private final static String tagAirflow = "airflow";
     private final static String tagAirflowMaxHeat = "airflow_max_heat";
     private final static String tagAirflowMaxCool = "airflow_max_cool";
@@ -665,7 +666,6 @@ class Data implements Comparable<Object> {
     public volatile boolean fanStartTest = false;
     public volatile boolean damperError = false;
     public volatile boolean damperResponse = true;
-    public final int[] airflowX = new int[]{0,5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,100};
     public volatile Stats[] airflowY;
     private final static int airflowSamples = 5;
     public volatile double airflowMaxCoolValue = 0;
@@ -723,8 +723,8 @@ public Data(ResolvedTestingUnit x) throws Throwable {
           Thread.sleep(30000);
         }
         if (hasPump){
-          waitFor(180000, 3000, tagPumpStatus, new Predicate<Object>(){
-            public boolean test(Object s){
+          waitFor(180000, 3000, tagPumpStatus, new Predicate<String>(){
+            public boolean test(String s){
               return s.equals("0");
             }
           });
@@ -735,8 +735,8 @@ public boolean test(Object s){
         if (!x.setValueAutoMark(tagSFSSLockValue, 0) || !x.setValueAutoMark(tagSFSSLockFlag, true)){
           fanError = true; break fanTest;
         }
-        b = waitFor(180000, 3000, tagSFST, new Predicate<Object>(){
-          public boolean test(Object s){
+        b = waitFor(180000, 3000, tagSFST, new Predicate<String>(){
+          public boolean test(String s){
             return s.equals("0");
           }
         });
@@ -747,8 +747,8 @@ public boolean test(Object s){
         if (!x.setValueAutoMark(tagSFSSLockValue, 1)){
           fanError = true; break fanTest;
         }
-        b = waitFor(180000, 3000, tagSFST, new Predicate<Object>(){
-          public boolean test(Object s){
+        b = waitFor(180000, 3000, tagSFST, new Predicate<String>(){
+          public boolean test(String s){
             return s.equals("1");
           }
         });
@@ -759,8 +759,8 @@ public boolean test(Object s){
       } else if (hasFan && (hasDamper && testDampers || hasHeatAO && testHeating || hasPump && testHeating)){
         // If we're going to test dampers or heating/cooling elements, then we lock the fan on
         if (x.setValueAutoMark(tagSFSSLockValue, 1) && x.setValueAutoMark(tagSFSSLockFlag, true)){
-          b = waitFor(180000, 3000, tagSFST, new Predicate<Object>(){
-            public boolean test(Object s){
+          b = waitFor(180000, 3000, tagSFST, new Predicate<String>(){
+            public boolean test(String s){
               return s.equals("1");
             }
           });
@@ -788,9 +788,9 @@ public boolean test(Object s){
                 damperError = true; break damperTest;
               }
             }
-            b = waitFor(240000, 3000, tagDamperPosition, new Predicate<Object>(){
-              public boolean test(Object s){
-                return Math.abs(Double.parseDouble(s.toString())-pos)<1;
+            b = waitFor(240000, 3000, tagDamperPosition, new Predicate<String>(){
+              public boolean test(String s){
+                return Math.abs(Double.parseDouble(s)-pos)<1;
               }
             });
             if (b==null){
@@ -834,9 +834,9 @@ public boolean test(Object s){
             if (!x.setValueAutoMark(tagAirflowLockValue, airflowMaxHeatValue) || !x.setValueAutoMark(tagDamperLockFlag, false) || !x.setValueAutoMark(tagAirflowLockFlag, true)){
               heatingError = true; break heatTest;
             }
-            waitFor(240000, 3000, tagAirflow, new Predicate<Object>(){
-              public boolean test(Object s){
-                return Math.abs(Double.parseDouble(s.toString())-airflowMaxHeatValue)<50;
+            waitFor(240000, 3000, tagAirflow, new Predicate<String>(){
+              public boolean test(String s){
+                return Math.abs(Double.parseDouble(s)-airflowMaxHeatValue)<50;
               }
             });
             final long dif = lim-System.currentTimeMillis();
@@ -915,8 +915,8 @@ public boolean test(Object s){
           if (!x.setValueAutoMark(tagPumpRevLockValue,0) || !x.setValueAutoMark(tagPumpRevLockFlag,true) || !x.setValueAutoMark(tagPumpCmdLockValue,0) || !x.setValueAutoMark(tagPumpCmdLockFlag,true)){
             heatingError = true; break heatTest;
           }
-          b = waitFor(180000, 3000, tagPumpStatus, new Predicate<Object>(){
-            public boolean test(Object s){
+          b = waitFor(180000, 3000, tagPumpStatus, new Predicate<String>(){
+            public boolean test(String s){
               return s.equals("0");
             }
           });
@@ -1073,7 +1073,7 @@ private Boolean checkAirflow() throws Throwable {
       }
       return false;
     }
-    private Boolean waitFor(long timeout, long interval, String tag, Predicate<Object> test) throws Throwable {
+    private Boolean waitFor(long timeout, long interval, String tag, Predicate<String> test) throws Throwable {
       final long lim = System.currentTimeMillis()+timeout;
       String s;
       do {
@@ -1209,16 +1209,11 @@ public void print(final StringBuilder sb, final boolean JSON){
       }
       sb.append("\n}");
     }
-    @Override public int compareTo(Object obj){
-      if (obj instanceof Data){
-        Data t = (Data)obj;
-        if (group==t.group){
-          return path.compareTo(t.path);
-        }else{
-          return group-t.group;
-        }
+    @Override public int compareTo(Data d){
+      if (group==d.group){
+        return path.compareTo(d.path);
       }else{
-        return -1;
+        return group-d.group;
       }
     }
   }