Commit 38c8e8da authored by Caelan Reese Wong's avatar Caelan Reese Wong
Browse files

Merge branch 'MostSimilar' into 'master' 

Resolve "Most Similar Molecule"

See merge request ec504/ec504_projects/group4!11
parents 1ef16dff 6519e5d2

src/edu/bu/ec504/project/Main.java

+22 −5
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ public class Main { 
            if (files != null) {

                for (File file : files) {

                    if (file.isFile()) {

                        for(int oo = 0;oo <1000;oo++)

                        moleculeArrayList.add(new Molecule(file.getPath()));

                    }

                }
@@ -23,9 +22,27 @@ public class Main { 
        }

        System.out.println(moleculeArrayList.size());

        Molecule tester = new Molecule(filename);

        for(Molecule m: moleculeArrayList) {

            if(m.isSubGraphPresent(tester) != null) {

                System.out.println(m.moleculeName);



        Molecule res=null;

        int similar=0;

        for(Molecule mol: moleculeArrayList)

        {

            int temp=mol.mostSimilar(moleculeArrayList.get(2));



            System.out.println(mol.moleculeName+" has "+ temp + " points");

            if(temp>similar)

            {

                similar=temp;

                res=mol;

            }

        }

        System.out.println("Most similar is "+ res.moleculeName);





        for(Molecule f: moleculeArrayList) {

            Molecule testing = new Molecule(filename);

            if (moleculeArrayList.get(0).areMoleculesEqual(testing) == null) {

                System.out.println("err");

            }

        }

    }