V2.02.11d

Some small updates to DL module for DCL training workshop

dependency-reduced-pom.xml

@@ -4,7 +4,7 @@
   <groupId>org.pamguard</groupId>
   <artifactId>Pamguard</artifactId>
   <name>Pamguard</name>
-  <version>2.02.11c</version>
+  <version>2.02.11d</version>
   <description>Pamguard using Maven to control dependencies</description>
   <url>www.pamguard.org</url>
   <organization>
@@ -158,11 +158,8 @@
       <url>https://artifacts.unidata.ucar.edu/repository/unidata-all/</url>
     </repository>
     <repository>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
       <id>bedatadriven</id>
-      <name>bedatadriven_renjin</name>
+      <name>bedatadriven public repo</name>
       <url>https://nexus.bedatadriven.com/content/groups/public/</url>
     </repository>
     <repository>

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.pamguard</groupId>
   <artifactId>Pamguard</artifactId>
-  <version>2.02.11c</version>
+  <version>2.02.11d</version>
   <name>Pamguard</name>
   <description>Pamguard using Maven to control dependencies</description>
 	<url>www.pamguard.org</url>
@@ -301,14 +301,14 @@
 	<dependency>
 		<groupId>io.github.macster110</groupId>
 		<artifactId>jpamutils</artifactId>
-		<version>0.0.58</version>
+		<version>0.0.59</version>
 	</dependency>
 
 	<!--jpam project - Deep learning java library -->
 	<dependency>
 		<groupId>io.github.macster110</groupId>
 		<artifactId>jdl4pam</artifactId>
-		<version>0.0.99</version>
+		<version>0.0.99a</version>
 	</dependency> 
 			
 	<!-- https://mvnrepository.com/artifact/gov.nist.math/jama -->

src/Array/HydrophoneDataBlock.java

@@ -70,10 +70,10 @@ public class HydrophoneDataBlock extends PamDataBlock<HydrophoneDataUnit> {
 	public boolean loadViewerData(OfflineDataLoadInfo offlineDataLoadInfo,
 			ViewLoadObserver loadObserver) {
 		
-		if (offlineDataLoadInfo!=null) {
-		System.out.print("Load Hydrophones: " + ((offlineDataLoadInfo.getEndMillis() - offlineDataLoadInfo.getStartMillis())/1000/60/60 + " hours"));
-		System.out.print("From: " +PamCalendar.formatDateTime(offlineDataLoadInfo.getStartMillis()) + " to " +  PamCalendar.formatDateTime(offlineDataLoadInfo.getEndMillis()));
-		}
+//		if (offlineDataLoadInfo!=null) {
+//		System.out.print("Load Hydrophones: " + ((offlineDataLoadInfo.getEndMillis() - offlineDataLoadInfo.getStartMillis())/1000/60/60 + " hours"));
+//		System.out.print("From: " +PamCalendar.formatDateTime(offlineDataLoadInfo.getStartMillis()) + " to " +  PamCalendar.formatDateTime(offlineDataLoadInfo.getEndMillis()));
+//		}
 		/**
 		 * Always put in default data units at time zero. 
 		 */

src/NMEA/AcquireNmeaData.java

@@ -40,8 +40,6 @@ import java.util.Random;
 import javax.swing.SwingUtilities;
 import javax.swing.Timer;
 
-import org.apache.commons.math3.analysis.function.Signum;
-
 import serialComms.jserialcomm.PJSerialComm;
 import serialComms.jserialcomm.PJSerialException;
 import serialComms.jserialcomm.PJSerialLineListener;

src/PamController/PamguardVersionInfo.java

@@ -31,12 +31,12 @@ public class PamguardVersionInfo {
 	 * Version number, major version.minorversion.sub-release.
 	 * Note: can't go higher than sub-release 'f'
 	 */
-	static public final String version = "2.02.11c";
+	static public final String version = "2.02.11d";
 	
 	/**
 	 * Release date
 	 */
-	static public final String date = "29 April 2024";
+	static public final String date = "30 May 2024";
 	
 //	/**
 //	 * Release type - Beta or Core

src/PamModel/PamModel.java

@@ -1198,7 +1198,7 @@ final public class PamModel implements PamSettings {
 					    this.setPluginBeingLoaded(className);
 //						Class c = cl.loadClass(className);
 					    /*
-					     * Was Failing here if a plugin is loaded before a plugin that has classes
+					     * Was Failing here  if a plugin is loaded before a plugin that has classes
 					     * this one is dependent on. Seems that if we set the second parameter to 
 					     * false then it doesn't fully initialize the class, so will be OK, get past
 					     * this stage and fully load the class when it's used.  
@@ -1279,6 +1279,7 @@ final public class PamModel implements PamSettings {
 							// if there were any errors while accessing the plugin, let the user know and then move
 							// on to the next plugin.
 							} catch (Throwable e1) {
+								e1.printStackTrace();
 								String title = "Error accessing plug-in module";
 								String msg = "There is an error with the plug-in module " + className + ".<p>" +
 										"This may have been caused by an incompatibility between " +

src/effortmonitor/EffortDataBlock.java

@@ -51,7 +51,7 @@ public class EffortDataBlock extends PamDataBlock<EffortDataUnit> {
 				long origEnd = offlineDataLoadInfo.getEndMillis();
 				long dataStart = Math.min(offlineDataLoadInfo.getStartMillis(), dmc.getFirstTime() - 360000000L);
 				long dataEnd = Math.max(offlineDataLoadInfo.getEndMillis(), dmc.getLastTime() + 360000000L);
-				System.out.printf("Load effort data from %s to %s\n", PamCalendar.formatDBDateTime(dataStart), PamCalendar.formatDBDateTime(dataEnd));
+//				System.out.printf("Load effort data from %s to %s\n", PamCalendar.formatDBDateTime(dataStart), PamCalendar.formatDBDateTime(dataEnd));
 				offlineDataLoadInfo.setStartMillis(dataStart);
 				offlineDataLoadInfo.setEndMillis(dataEnd);
 			}

src/offlineProcessing/OfflineTaskGroup.java

@@ -602,7 +602,7 @@ public class OfflineTaskGroup implements PamSettings {
 
 		/**
 		 * Called to process data currently in memory. i.e. get's called 
-		 * once when processing loaded data, multiple times when pocessing all data. 
+		 * once when processing loaded data, multiple times when processing all data. 
 		 * @param globalProgress
 		 * @param mapPoint
 		 * @param processStartTime