Made a new constructor for the HoughTransformer

I also made an enum for the different galaxy categories.

Author: csasarak

Category.java

@@ -0,0 +1,11 @@
+/**
+ * filename: Category.java
+ *
+ * @class CategoryEnum This class represents what category
+ * of galaxy an image is in. It can be one of elliptical, 
+ * spiral, or undefined.
+ */
+
+public enum Category {
+    ELLIPTICAL,SPIRAL,UNDEFINED
+}

HoughTransformer.java

@@ -17,18 +17,23 @@
 
 public class HoughTransformer{
 
-    int centerTolerance, houghTolerance;
+    int centerTolerance; 
+    double houghTolerance;
 
     /**
      * The first constructor for HoughTransformer which
      * will set the tolerance for the center of the circle.
      *
      * @param centerTolerance The tolerance in pixels for center of the circle.
      * @param houghTolerance Tolerance for the hough transform (0.0 - 1.0)
+     * @param houghConfidence The threshold 
+     *        confidence for determining the type of galaxy.
      */
-    public HoughTransformer(int centerTolerance, double houghTolerance){
+    public HoughTransformer(int centerTolerance, double houghTolerance, 
+        double houghConfidence){
         this.centerTolerance = centerTolerance;
         this.houghTolerance = houghTolerance;
+        this.houghConfidence = houghConfidence;
     }
 
     /**
@@ -39,7 +44,7 @@ public HoughTransformer(int centerTolerance, double houghTolerance){
      * @param img The image to do the processing on.
      * @return boolean Whether or not a circle was found.
      */
-    public void process(RenderedImage img){
+    public Category process(RenderedImage img){
         int width = img.getWidth(), height = img.getHeight();
         float[] imgData = img.getData().getPixels(0,0, width, 
             height, (float[])null);
@@ -53,27 +58,29 @@ public void process(RenderedImage img){
         LocatedCircle circle = hough.getLargestCircle(imgData, 
             img.getWidth(), img.getHeight());
 
+        System.out.println(circle.getRadius());
+        System.out.println("Location: ("+circle.getX() +"," +circle.getY());
+        System.out.println("Confidence: " + circle.getConfidence());
         /**
          * Check that the circle we're looking for is near the center.
          * If it is not, then the hough transform probably found
          * a larger object than the one in question and failed.
          */
-        int circX = circle.getX(), circY = circle.getY();
-        if((circX < width-centerTolerance || circX > width-centerTolerance)
+        double circX = circle.getX(), circY = circle.getY();
+        if((circX < width-centerTolerance || circX > width+centerTolerance)
             || (circY < height-centerTolerance || circY>height+centerTolerance))
             return Category.UNDEFINED;
-
-        System.out.println(circle.getRadius());
-        System.out.println("Location: ("+circle.getX() +"," +circle.getY());
-        System.out.println("Confidence: " + circle.getConfidence());
+        
+        return Category.UNDEFINED;
     }
 
 
     public static void main(String args[]){
         if(args.length < 1)
             System.exit(1);
 
-        HoughTransformer trans = new HoughTransformer();
+        //The last parameter is a placeholder for now
+        HoughTransformer trans = new HoughTransformer(100, .70, 100.0);
 
         try{
             trans.process(ImageIO.read(new File(args[0])));

ImageProcessor.java

@@ -21,7 +21,7 @@ public static void main(String args[]){
         processor.add(new MorphologicalCloseProcess()); 
         processor.add(new GrayConvertProcess());
         processor.add(new MonoscaleProcess());
-//        processor.add(new SobelDetectionProcess());
+        processor.add(new SobelDetectionProcess());
 
         for(int n = 0; n < args.length; n++){
             String inputFilename = args[n];