Commit e24c9309 authored by Rohan Kumar's avatar Rohan Kumar
Browse files

Merge branch 'front-end' into 'master' 

Front end

See merge request ec504/ec504_projects/group8!20
parents 044d5be2 512d9446

.idea/modules.xml

0 → 100644
+8 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="ProjectModuleManager">

    <modules>

      <module fileurl="file://$PROJECT_DIR$/.idea/group8.iml" filepath="$PROJECT_DIR$/.idea/group8.iml" />

    </modules>

  </component>

</project>
 
 No newline at end of file

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
        <maven.compiler.source>17</maven.compiler.source>

        <maven.compiler.target>17</maven.compiler.target>

        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

        <exec.mainClass>top.BackendJava</exec.mainClass>

        <exec.mainClass>object_detection.ObjectDetector</exec.mainClass>

    </properties>



    <build>

src/main/java/object_detection/ObjectDetector.java

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ public class ObjectDetector { 
        System.out.println(objSet);

        System.out.println("====> Finished Object Mapping");



        MongoDBInteraction mdbi = new MongoDBInteraction();

        mdbi.updateObjectSet(5, objSet);

        //MongoDBInteraction mdbi = new MongoDBInteraction();

        //mdbi.updateObjectSet(5, objSet);

    }



    /**

src/main/java/object_detection/types/ObjectSet.java

+8 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public class ObjectSet { 
        }



        // in this line, if the reps are 20% similar, assume this is the same set.

        return (count) > (Math.max(r1.length, r2.length)*0.1);

        return (count) > (Math.max(r1.length, r2.length)*0.2);

    }



    /**
@@ -184,6 +184,12 @@ public class ObjectSet { 
     */

    @Override

    public String toString(){

        return "ObjectSet of : " + this.objects.size() + " objects";

        StringBuilder res = new StringBuilder("ObjectSet of : " + this.objects.size() + " objects:");



        for(PointSet p : this.objects){

            res.append(p).append("\n");

        }



        return res.toString();

    }

}
 
 No newline at end of file

src/main/java/object_detection/types/Point.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public class Point { 
            return false;

        }

        Point p = (Point) o;

        return Point.equals(this, p, (float) 2);

        return Point.equals(this, p, (float) 6);

    }



    @Override