LISTSERV 16.5 - LCD-CVS Archives

Commit in `CDMS` on MAIN
`pom.xml`	+7		1.2 -> 1.3
`src/CDMS/Partridge/Cluster/SeededNNClustering.java`		-1	1.1 -> 1.2
`/VanillaNNClustering.java`		-1	1.1 -> 1.2
`src/CDMS/Partridge/FeatureFinder/Feature.java`		-1	1.1 -> 1.2
`/FeatureFinder.java`		-3	1.1 -> 1.2
`/FeatureFinderTest.java`		-3	1.1 -> 1.2
`src/CDMS/Partridge/OldStuff/ImageAnalysis.java`		-1	1.1 -> 1.2
`/ImageDescriptor.java`	+2	-1	1.1 -> 1.2
`/ProcessImage.java`		-1	1.1 -> 1.2
`/ReadBMP.java`		-1	1.1 -> 1.2
`/ReadTGA.java`		-1	1.1 -> 1.2
`/WriteBMP.java`		-1	1.1 -> 1.2
	+9	-15

12 modified files

Minor updates

CDMS

pom.xml 1.2 -> 1.3

diff -u -r1.2 -r1.3
--- pom.xml	28 Jul 2010 17:33:09 -0000	1.2
+++ pom.xml	11 Oct 2010 00:34:01 -0000	1.3
@@ -159,5 +159,12 @@

             <artifactId>GeomConverter</artifactId>
             <version>1.10-SNAPSHOT</version>
         </dependency>

+        <dependency>
+            <groupId>org.lcsim</groupId>
+            <artifactId>lcsim</artifactId>
+            <version>1.14-SNAPSHOT</version>
+            <type>jar</type>
+        </dependency>

     </dependencies>
 </project>

CDMS/src/CDMS/Partridge/Cluster

SeededNNClustering.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- SeededNNClustering.java	11 Oct 2010 00:25:44 -0000	1.1
+++ SeededNNClustering.java	11 Oct 2010 00:34:01 -0000	1.2
@@ -3,7 +3,6 @@

  */
 package CDMS.Partridge.Cluster;

-import CDMS.Partridge.Cluster.Cluster;

 import CDMS.Partridge.ImageUtils.PixelArray;
 import java.util.ArrayList;
 import java.util.HashMap;

CDMS/src/CDMS/Partridge/Cluster

VanillaNNClustering.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- VanillaNNClustering.java	11 Oct 2010 00:25:44 -0000	1.1
+++ VanillaNNClustering.java	11 Oct 2010 00:34:01 -0000	1.2
@@ -3,7 +3,6 @@

  */
 package CDMS.Partridge.Cluster;

-import CDMS.Partridge.Cluster.Cluster;

 import CDMS.Partridge.ImageUtils.PixelArray;
 import java.util.ArrayList;
 import java.util.HashMap;

CDMS/src/CDMS/Partridge/FeatureFinder

Feature.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- Feature.java	11 Oct 2010 00:25:44 -0000	1.1
+++ Feature.java	11 Oct 2010 00:34:01 -0000	1.2
@@ -5,7 +5,6 @@

 package CDMS.Partridge.FeatureFinder;
 
 import CDMS.Partridge.Cluster.Cluster;

-import CDMS.Partridge.ImageComparison.*;

 
 /**
  * Encapsulate the properties of an image feature.  A feature consists of

CDMS/src/CDMS/Partridge/FeatureFinder

FeatureFinder.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- FeatureFinder.java	11 Oct 2010 00:25:44 -0000	1.1
+++ FeatureFinder.java	11 Oct 2010 00:34:01 -0000	1.2
@@ -6,9 +6,6 @@

 
 import CDMS.Partridge.Cluster.VanillaNNClustering;
 import CDMS.Partridge.Cluster.Cluster;

-import CDMS.Partridge.ImageComparison.*;
-import CDMS.Partridge.FeatureFinder.FeatureDef;
-import CDMS.Partridge.FeatureFinder.Feature;

 import CDMS.Partridge.ImageUtils.GeImage;
 import CDMS.Partridge.ImageUtils.PixelArray;
 import java.util.ArrayList;

CDMS/src/CDMS/Partridge/FeatureFinder

FeatureFinderTest.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- FeatureFinderTest.java	11 Oct 2010 00:25:44 -0000	1.1
+++ FeatureFinderTest.java	11 Oct 2010 00:34:01 -0000	1.2
@@ -4,9 +4,6 @@

  */
 package CDMS.Partridge.FeatureFinder;

-import CDMS.Partridge.FeatureFinder.FeatureFinder;
-import CDMS.Partridge.FeatureFinder.FeatureDef;
-import CDMS.Partridge.FeatureFinder.Feature;

 import CDMS.Partridge.FieldFlattening.FieldFlattener;
 import CDMS.Partridge.ImageUtils.GeImage;
 import CDMS.Partridge.ImageUtils.PixelArray;

CDMS/src/CDMS/Partridge/OldStuff

ImageAnalysis.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- ImageAnalysis.java	11 Oct 2010 00:25:44 -0000	1.1
+++ ImageAnalysis.java	11 Oct 2010 00:34:01 -0000	1.2
@@ -4,7 +4,6 @@

  */
 package CDMS.Partridge.OldStuff;

-import CDMS.Partridge.ImageComparison.*;

 import CDMS.Partridge.OldStuff.AnalyzeResults;
 import CDMS.Partridge.ImageUtils.GeImage;
 import CDMS.Partridge.ImageUtils.InterpolatePixelIntensity;

CDMS/src/CDMS/Partridge/OldStuff

ImageDescriptor.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- ImageDescriptor.java	11 Oct 2010 00:25:44 -0000	1.1
+++ ImageDescriptor.java	11 Oct 2010 00:34:01 -0000	1.2
@@ -4,7 +4,8 @@

 
 package CDMS.Partridge.OldStuff;

-import CDMS.Partridge.ImageUtils.*;

+import CDMS.Partridge.ImageUtils.GeImage;
+import CDMS.Partridge.ImageUtils.PixelArray;

 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;

CDMS/src/CDMS/Partridge/OldStuff

ProcessImage.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- ProcessImage.java	11 Oct 2010 00:25:44 -0000	1.1
+++ ProcessImage.java	11 Oct 2010 00:34:01 -0000	1.2
@@ -5,7 +5,6 @@

 
 package CDMS.Partridge.OldStuff;

-import CDMS.Partridge.OldStuff.Image;

 import CDMS.Partridge.ImageUtils.TransformedPixelArray;
 import java.io.IOException;
 //import org.lcsim.util.aida.AIDA;

CDMS/src/CDMS/Partridge/OldStuff

ReadBMP.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- ReadBMP.java	11 Oct 2010 00:25:44 -0000	1.1
+++ ReadBMP.java	11 Oct 2010 00:34:01 -0000	1.2
@@ -4,7 +4,6 @@

  */
 package CDMS.Partridge.OldStuff;

-import CDMS.Partridge.OldStuff.Image;

 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
 import java.io.FileInputStream;

CDMS/src/CDMS/Partridge/OldStuff

ReadTGA.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- ReadTGA.java	11 Oct 2010 00:25:44 -0000	1.1
+++ ReadTGA.java	11 Oct 2010 00:34:01 -0000	1.2
@@ -4,7 +4,6 @@

  */
 package CDMS.Partridge.OldStuff;

-import CDMS.Partridge.OldStuff.Image;

 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
 import java.io.FileInputStream;

CDMS/src/CDMS/Partridge/OldStuff

WriteBMP.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- WriteBMP.java	11 Oct 2010 00:25:44 -0000	1.1
+++ WriteBMP.java	11 Oct 2010 00:34:01 -0000	1.2
@@ -4,7 +4,6 @@

  */
 package CDMS.Partridge.OldStuff;

-import CDMS.Partridge.OldStuff.Image;

 import java.io.BufferedOutputStream;
 import java.io.DataOutputStream;
 import java.io.FileOutputStream;

CVSspam 0.2.8