commit many things

segment-anything-models-java · Nov 22, 2024 · bc8d63c · bc8d63c
1 parent a63c028
commit bc8d63c
Show file tree

Hide file tree

Showing 20 changed files with 238 additions and 1,491 deletions.
diff --git a/src/main/java/ai/nets/samj/communication/model/EfficientSAM.java b/src/main/java/ai/nets/samj/communication/model/EfficientSAM.java
@@ -44,7 +44,7 @@
  * @author Carlos Garcia Lopez de Haro
  * @author Vladimir Ulman
  */
-public class EfficientSAM implements SAMModel {
+public class EfficientSAM extends SAMModel {
 
 	private EfficientSamJ efficientSamJ;
 	private final SamEnvManagerAbstract manager;
@@ -111,14 +111,6 @@ public String getDescription() {
 		return HTML_DESCRIPTION + (!this.installed ? SAMModel.HTML_NOT_INSTALLED : CAUTION_STRING);
 	}
 
-	@Override
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean isInstalled() {
-		return installed;
-	}
-
 	@Override
 	/**
 	 * {@inheritDoc}
@@ -144,14 +136,6 @@ public <T extends RealType<T> & NativeType<T>> void setImage(final RandomAccessi
 		}
 	}
 
-	@Override
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setInstalled(boolean installed) {
-		this.installed = installed;		
-	}
-
 	@Override
 	/**
 	 * {@inheritDoc}

diff --git a/src/main/java/ai/nets/samj/communication/model/EfficientViTSAML0.java b/src/main/java/ai/nets/samj/communication/model/EfficientViTSAML0.java
@@ -44,7 +44,7 @@
  * @author Carlos Garcia Lopez de Haro
  * @author Vladimir Ulman
  */
-public class EfficientViTSAML0 implements SAMModel {
+public class EfficientViTSAML0 extends SAMModel {
 
 	private EfficientViTSamJ efficientSamJ;
 	private final SamEnvManagerAbstract manager;
@@ -136,14 +136,6 @@ public <T extends RealType<T> & NativeType<T>> void setImage(final RandomAccessi
 		}
 	}
 
-	@Override
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setInstalled(boolean installed) {
-		this.installed = installed;		
-	}
-
 	/**
 	 * Create an instance of the model that loads the model and encodes an image
 	 */

diff --git a/src/main/java/ai/nets/samj/communication/model/EfficientViTSAML1.java b/src/main/java/ai/nets/samj/communication/model/EfficientViTSAML1.java
@@ -44,7 +44,7 @@
  * @author Carlos Garcia Lopez de Haro
  * @author Vladimir Ulman
  */
-public class EfficientViTSAML1 implements SAMModel {
+public class EfficientViTSAML1 extends SAMModel {
 
 	private EfficientViTSamJ efficientSamJ;
 	private final SamEnvManagerAbstract manager;
@@ -66,7 +66,6 @@ public void error(String text) {
 		}
 
 	};
-	private Boolean installed = false;
 	private boolean onlyBiggest = false;
 	/**
 	 * "Official" name of the model
@@ -100,15 +99,7 @@ public String getName() {
 	 * {@inheritDoc}
 	 */
 	public String getDescription() {
-		return HTML_DESCRIPTION + (!this.installed ? SAMModel.HTML_NOT_INSTALLED : "");
-	}
-
-	@Override
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean isInstalled() {
-		return installed;
+		return HTML_DESCRIPTION + (!this.isInstalled() ? SAMModel.HTML_NOT_INSTALLED : "");
 	}
 
 	@Override
@@ -136,14 +127,6 @@ public <T extends RealType<T> & NativeType<T>> void setImage(final RandomAccessi
 		}
 	}
 
-	@Override
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setInstalled(boolean installed) {
-		this.installed = installed;		
-	}
-
 	/**
 	 * Create an instance of the model that loads the model and encodes an image
 	 */

diff --git a/src/main/java/ai/nets/samj/communication/model/EfficientViTSAML2.java b/src/main/java/ai/nets/samj/communication/model/EfficientViTSAML2.java
@@ -44,7 +44,7 @@
  * @author Carlos Garcia Lopez de Haro
  * @author Vladimir Ulman
  */
-public class EfficientViTSAML2 implements SAMModel {
+public class EfficientViTSAML2 extends SAMModel {
 
 	private EfficientViTSamJ efficientSamJ;
 	private final SamEnvManagerAbstract manager;
@@ -66,7 +66,6 @@ public void error(String text) {
 		}
 
 	};
-	private Boolean installed = false;
 	private boolean onlyBiggest = false;
 	/**
 	 * Model complete name
@@ -99,15 +98,7 @@ public String getName() {
 	 * {@inheritDoc}
 	 */
 	public String getDescription() {
-		return HTML_DESCRIPTION + (!this.installed ? SAMModel.HTML_NOT_INSTALLED : "");
-	}
-
-	@Override
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean isInstalled() {
-		return installed;
+		return HTML_DESCRIPTION + (!this.isInstalled() ? SAMModel.HTML_NOT_INSTALLED : "");
 	}
 
 	@Override
@@ -135,14 +126,6 @@ public <T extends RealType<T> & NativeType<T>> void setImage(final RandomAccessi
 		}
 	}
 
-	@Override
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setInstalled(boolean installed) {
-		this.installed = installed;		
-	}
-
 	/**
 	 * Create an instance of the model that loads the model and encodes an image
 	 */

diff --git a/src/main/java/ai/nets/samj/communication/model/EfficientViTSAMXL0.java b/src/main/java/ai/nets/samj/communication/model/EfficientViTSAMXL0.java
@@ -44,7 +44,7 @@
  * @author Carlos Garcia Lopez de Haro
  * @author Vladimir Ulman
  */
-public class EfficientViTSAMXL0 implements SAMModel {
+public class EfficientViTSAMXL0 extends SAMModel {
 
 	private EfficientViTSamJ efficientSamJ;
 	private final SamEnvManagerAbstract manager;
@@ -66,7 +66,6 @@ public void error(String text) {
 		}
 
 	};
-	private Boolean installed = false;
 	private boolean onlyBiggest = false;
 	/**
 	 * Name of the model
@@ -99,15 +98,7 @@ public String getName() {
 	 * {@inheritDoc}
 	 */
 	public String getDescription() {
-		return HTML_DESCRIPTION + (!this.installed ? SAMModel.HTML_NOT_INSTALLED : "");
-	}
-
-	@Override
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean isInstalled() {
-		return installed;
+		return HTML_DESCRIPTION + (!this.isInstalled() ? SAMModel.HTML_NOT_INSTALLED : "");
 	}
 
 	@Override
@@ -135,14 +126,6 @@ public <T extends RealType<T> & NativeType<T>> void setImage(final RandomAccessi
 		}
 	}
 
-	@Override
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setInstalled(boolean installed) {
-		this.installed = installed;		
-	}
-
 	/**
 	 * Create an instance of the model that loads the model and encodes an image
 	 */

diff --git a/src/main/java/ai/nets/samj/communication/model/EfficientViTSAMXL1.java b/src/main/java/ai/nets/samj/communication/model/EfficientViTSAMXL1.java
@@ -44,7 +44,7 @@
  * @author Carlos Garcia Lopez de Haro
  * @author Vladimir Ulman
  */
-public class EfficientViTSAMXL1 implements SAMModel {
+public class EfficientViTSAMXL1 extends SAMModel {
 
 	private EfficientViTSamJ efficientSamJ;
 	private final SamEnvManagerAbstract manager;
@@ -66,7 +66,6 @@ public void error(String text) {
 		}
 
 	};
-	private Boolean installed = false;
 	private boolean onlyBiggest = false;
 
 	/**
@@ -101,15 +100,7 @@ public String getName() {
 	 * {@inheritDoc}
 	 */
 	public String getDescription() {
-		return HTML_DESCRIPTION + (!this.installed ? SAMModel.HTML_NOT_INSTALLED : "");
-	}
-
-	@Override
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean isInstalled() {
-		return installed;
+		return HTML_DESCRIPTION + (!this.isInstalled() ? SAMModel.HTML_NOT_INSTALLED : "");
 	}
 
 	@Override
@@ -137,14 +128,6 @@ public <T extends RealType<T> & NativeType<T>> void setImage(final RandomAccessi
 		}
 	}
 
-	@Override
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setInstalled(boolean installed) {
-		this.installed = installed;		
-	}
-
 	/**
 	 * Create an instance of the model that loads the model and encodes an image
 	 */

diff --git a/src/main/java/ai/nets/samj/communication/model/SAM2Large.java b/src/main/java/ai/nets/samj/communication/model/SAM2Large.java
@@ -44,7 +44,7 @@
  * @author Carlos Garcia Lopez de Haro
  * @author Vladimir Ulman
  */
-public class SAM2Large implements SAMModel {
+public class SAM2Large extends SAMModel {
 
 	private Sam2 efficientSamJ;
 	private final SamEnvManagerAbstract manager;
@@ -66,7 +66,6 @@ public void error(String text) {
 		}
 
 	};
-	private Boolean installed = false;
 	private boolean onlyBiggest = false;
 	/**
 	 * Name of the model
@@ -108,15 +107,7 @@ public String getName() {
 	 * {@inheritDoc}
 	 */
 	public String getDescription() {
-		return HTML_DESCRIPTION + (!this.installed ? SAMModel.HTML_NOT_INSTALLED : CAUTION_STRING);
-	}
-
-	@Override
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean isInstalled() {
-		return installed;
+		return HTML_DESCRIPTION + (!this.isInstalled() ? SAMModel.HTML_NOT_INSTALLED : CAUTION_STRING);
 	}
 
 	@Override
@@ -143,14 +134,6 @@ public <T extends RealType<T> & NativeType<T>> void setImage(final RandomAccessi
 		}
 	}
 
-	@Override
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setInstalled(boolean installed) {
-		this.installed = installed;		
-	}
-
 	@Override
 	/**
 	 * {@inheritDoc}

diff --git a/src/main/java/ai/nets/samj/communication/model/SAM2Small.java b/src/main/java/ai/nets/samj/communication/model/SAM2Small.java
@@ -44,7 +44,7 @@
  * @author Carlos Garcia Lopez de Haro
  * @author Vladimir Ulman
  */
-public class SAM2Small implements SAMModel {
+public class SAM2Small extends SAMModel {
 
 	private Sam2 efficientSamJ;
 	private final SamEnvManagerAbstract manager;
@@ -66,7 +66,6 @@ public void error(String text) {
 		}
 
 	};
-	private Boolean installed = false;
 	private boolean onlyBiggest = false;
 	/**
 	 * Name of the model
@@ -108,15 +107,7 @@ public String getName() {
 	 * {@inheritDoc}
 	 */
 	public String getDescription() {
-		return HTML_DESCRIPTION + (!this.installed ? SAMModel.HTML_NOT_INSTALLED : CAUTION_STRING);
-	}
-
-	@Override
-	/**
-	 * {@inheritDoc}
-	 */
-	public boolean isInstalled() {
-		return installed;
+		return HTML_DESCRIPTION + (!this.isInstalled() ? SAMModel.HTML_NOT_INSTALLED : CAUTION_STRING);
 	}
 
 	@Override
@@ -144,14 +135,6 @@ public <T extends RealType<T> & NativeType<T>> void setImage(final RandomAccessi
 		}
 	}
 
-	@Override
-	/**
-	 * {@inheritDoc}
-	 */
-	public void setInstalled(boolean installed) {
-		this.installed = installed;		
-	}
-
 	@Override
 	/**
 	 * {@inheritDoc}