Commit ce267c7e authored by Seyed Reza Sajjadinasab's avatar Seyed Reza Sajjadinasab
Browse files

fixBugOfUpdateToken

parent 6a0c4126

CheckerCorrector/Checker.java

+9 −3
Original line number Diff line number Diff line
@@ -26,14 +26,20 @@ public class Checker { 
            if(argPars.isCheckFile()){

                SentenceExtractor extractor = SentenceExtractor.of(argPars.getFileName());

                List<String> extractedSentences = extractor.getSentences();  

                int i = 0;

                int n = extractedSentences.size();

                int cntUpdate = 0;

                for (String sentence : extractedSentences) {

                    dbInterface.updateTokenInDatabase(sentence.toLowerCase(), graph);

                    i++;

                    //dbInterface.updateTokenInDatabase(sentence.toLowerCase(), graph);

                    PhraseExtractor extractorPhrase = PhraseExtractor.fromSentence(sentence, 3, 5);

                    List<String> phrases = extractorPhrase.getPhrases();

                    for (String phrase : phrases) {

                        dbInterface.updateTokenInDatabase(phrase.toLowerCase(), graph);

                        cntUpdate += dbInterface.updateTokenInDatabase(phrase.toLowerCase(), graph);

                    } 

                    ProgressBar.printProgress(((double)i)/((double)n));                     

                }

                System.out.println("\n-------------------------------------------\n"+ "Number of update: "+ cntUpdate);

            }else if(argPars.isCheckSentence()){

                //dbInterface.updateTokenInDatabase(argPars.getSentence().toLowerCase(), graph);

                for (String phrase : PhraseExtractor.fromSentence(argPars.getSentence(),3, 5).getPhrases()) {

CheckerCorrector/DBinterface/DBinterface.java

+23 −18
Original line number Diff line number Diff line
@@ -218,12 +218,12 @@ public class DBinterface { 
        return new String();

    }



    public void updateTokenInDatabase(String sentence, DirectedGraph<State> graph){

    public int updateTokenInDatabase(String sentence, DirectedGraph<State> graph){

        //System.out.print(sentence + " |");

        sentence = StringProcessor.processString(sentence);

        

        if(sentence.equals(""))

            return;

            return 0;

        StateMachine SM = new StateMachine();

        sentence = sentence.replaceAll("\\p{Punct}", " $0");

        //System.out.println(sentence);
@@ -287,28 +287,33 @@ public class DBinterface { 
               // System.out.println(actions);

              //  System.out.println(suggested);

              //  System.out.println("---------------------------");

                int cntUp=0;

                

                for(int i=0; i<suggested.size(); i++){

                    if(!suggested.get(i).toString().equals(tokens[i]))

                        cntUp++;

                    if(!suggested.get(i).toString().equals(tokens[i])){

                        if(!missFlag.get(i))

                            return 0;

                    }

                        

                if(cntUp<3){

                }

                int cntUpdate = 0;

                for(int i=0; i<tokens.length; i++){

                    if(missFlag.get(i)){

                        if(!suggested.get(i).toString().equals(tokens[i]) && !suggested.get(i).toString().equals("nan") && State.validSuggestedState(suggested.get(i))){

                                System.out.println(sentence);

                            System.out.println("\n"+sentence);

                            System.out.println(actions);

                            System.out.println(suggested);

                            System.out.println(missFlag);

                            System.out.println(tokens[i] + " -> " + suggested.get(i));

                            System.out.println("--------------------------------");

                            wordRolesMap.put(tokens[i], suggested.get(i).toString()); 

                            cntUpdate++;

                        }

                    }

                }

                return cntUpdate;

                

            }

            }

            return 0;

    }

CheckerCorrector/DirectedGraph/BasicGraph.java

+8 −6
Original line number Diff line number Diff line
@@ -37,14 +37,15 @@ public class BasicGraph { 
        //graph.addEdge(State.COMMA,     State.PRONOUN);

        graph.addEdge(State.COMMA,     State.CONJ);

        graph.addEdge(State.CONJ,      State.PRONOUN);

        graph.addEdge(State.PRONOUN,   State.CAN);

        graph.addEdge(State.CAN,       State.VERB);

        graph.addEdge(State.PRONOUN,   State.MODAL);

        graph.addEdge(State.NOUN,   State.MODAL);

        graph.addEdge(State.MODAL,       State.VERB);

        graph.addEdge(State.IF,        State.PRONOUN);

        graph.addEdge(State.THAT,      State.PRONOUN);

        graph.addEdge(State.IF,        State.NOUN);

        graph.addEdge(State.THAT,      State.NOUN);

        graph.addEdge(State.NOUN,      State.VERB);

        graph.addEdge(State.NOUN,      State.CAN);

        graph.addEdge(State.NOUN,      State.MODAL);

        //graph.addEdge(State.VERB,      State.NOT);

        graph.addEdge(State.PRONOUN,   State.DOES);

        graph.addEdge(State.NOUN,      State.DOES);
@@ -54,9 +55,7 @@ public class BasicGraph { 
        graph.addEdge(State.NOT,       State.ADJECTIVE);

        graph.addEdge(State.NOT,       State.ARTICLE);

        graph.addEdge(State.NOT,       State.DOT);

        graph.addEdge(State.OF,        State.NOUN);

        graph.addEdge(State.OF,        State.PRONOUN);

        graph.addEdge(State.NOUN,      State.OF);

        graph.addEdge(State.PREPOS,        State.PRONOUN);

        graph.addEdge(State.NOUN,      State.IS);

        graph.addEdge(State.PRONOUN,   State.IS);

        graph.addEdge(State.IS,        State.ADJECTIVE);
@@ -67,6 +66,9 @@ public class BasicGraph { 
        graph.addEdge(State.VERB,      State.PREPOS);

        graph.addEdge(State.IS,      State.PREPOS);

        graph.addEdge(State.PREPOS,      State.NOUN);

        graph.addEdge(State.PREPOS,      State.ARTICLE);

        graph.addEdge(State.PREPOS,      State.ADJECTIVE);

        graph.addEdge(State.ADVERB,      State.VERB);





    }

CheckerCorrector/SQLite/mydatabase.db

(12 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

CheckerCorrector/SQLite/newdatabase.db

(12 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file