Выполняю по максу и средние по максаУвеличение в 2

kamilsa · Nov 23, 2014 · acdb81b · acdb81b
1 parent 997c742
commit acdb81b
Show file tree

Hide file tree

Showing 4 changed files with 114 additions and 9 deletions.
diff --git a/SentAnalysisParser.iml b/SentAnalysisParser.iml
@@ -36,4 +36,5 @@
       </library>
     </orderEntry>
   </component>
-</module>
+</module>
+
diff --git a/src/ru/kamil/innopolis/sentiment/analysis/AnalisysText.java b/src/ru/kamil/innopolis/sentiment/analysis/AnalisysText.java
@@ -28,7 +28,7 @@ public AnalisysText(ArrayList<New> news){
     }
 
     public ArrayList<ArrayList<StemmedWord>> procedureNew(New _new){
-        StringTokenizer st = new StringTokenizer(_new.getText(), ".?!;");
+        StringTokenizer st = new StringTokenizer(_new.getText(), ".");
         String currSentence;
         ArrayList<ArrayList<StemmedWord>> sentences = new ArrayList<ArrayList<StemmedWord>>();
         while(st.hasMoreTokens()){
@@ -149,14 +149,46 @@ public ArrayList<ArrayList<StemmedWord>> procedureNew(New _new){
 
 
                 System.out.println(names[i] + " :");
+                double mean2[] = new double[8];
+                boolean proceed[] = new boolean[]{false, false, false, false, false,false,false,false};
+                for (int j = 0; j < 8; j++) {
+                    double min = mean[0];
+                    int mininx = 0;
+                    boolean good = false;
+                    for (int k = 0; k < 8; k++) {
+                        if (mean[k] < min &&  !proceed[k])
+                        {
+                            min = mean[k];
+                            mininx = k;
+                            good = true;
+                        }
+                    }
+                    if (proceed[0] && good) {
+                        proceed[mininx] = true;
+                        double min2 = mean[0];
+                        int mininx2 = 0;
+                        good = false;
+                        for (int k = 0; k < 8; k++) {
+                            if (!proceed[k] && mean[k] < min2) {
+                                min2 = mean[k];
+                                mininx2 = k;
+                                good = true;
+                            }
+                        }
+                        mean2[mininx2] =mean[mininx2] + ( mean[mininx2] - mean[mininx])*100;
+                    }
+                }
+
+                for (int j = 0; j < 8; j++) {
+       //             mean[j] = mean2[j];
+                }
+
                 System.out.println("Mean of max " + mean[i] + " Var of maxs " + variance[i]);
                 System.out.println("Prob " + mean[i] * (1-variance[i]*10) );
                 probsMap.put(names[i], mean[i] * (1-variance[i]*10));
                 mean[i] = StatUtils.mean(array2);
                 variance[i] = StatUtils.variance(array2);// variance
                 System.out.println("Mean of vars " + mean[i] + " Var of vars" + variance[i]);
-
-
             }
             Double sum = 0d;
             for(String name : names){
@@ -171,7 +203,7 @@ public ArrayList<ArrayList<StemmedWord>> procedureNew(New _new){
 //            }
 
 //            Vector<Float> v = DBHelper.getWord(sentences.get(0).get(3));
-////            System.out.println(sentences.get(0).get(3).getStemText());
+////            System.out.println(sentences.get(0).get(3).getText());
 //            for(Float f : v){
 //                System.out.println(f);
 //            }

diff --git a/src/ru/kamil/innopolis/sentiment/database/DBHelper.java b/src/ru/kamil/innopolis/sentiment/database/DBHelper.java
@@ -86,7 +86,7 @@ public static Vector<Float> getWord(StemmedWord sw){
             }
             float adding = 0;
             if (sw.getTag().equals("v"))
-                adding +=0.2;
+                adding +=0.05;
 
             res.add(rs.getFloat("afraid"));
             res.add(rs.getFloat("amused"));

diff --git a/src/ru/kamil/innopolis/sentiment/parser/New.java b/src/ru/kamil/innopolis/sentiment/parser/New.java
@@ -150,16 +150,88 @@ private void procedureNew(){
 
 				mean[i] = StatUtils.mean(array1);
 				variance[i] = StatUtils.variance(array1);// means
-
-
-				System.out.println(names[i] + " :");
+                double mean2[] = new double[8];
+                boolean proceed[] = new boolean[]{false, false, false, false, false,false,false,false};
+                for (int j = 0; j < 8; j++) {
+                    double min = mean[0];
+                    int mininx = 0;
+                    boolean good = false;
+                    for (int k = 0; k < 8; k++) {
+                        if (mean[k] < min &&  !proceed[k])
+                        {
+                            min = mean[k];
+                            mininx = k;
+                            good = true;
+                        }
+                    }
+                    if (!proceed[0] && good) {
+                        proceed[mininx] = true;
+                        double min2 = mean[0];
+                        int mininx2 = 0;
+                        good = false;
+                        for (int k = 0; k < 8; k++) {
+                            if (!proceed[k] && mean[k] < min2) {
+                                min2 = mean[k];
+                                mininx2 = k;
+                                good = true;
+                            }
+                        }
+                        mean2[mininx2] =mean[mininx2] + ( mean[mininx2] - mean[mininx])*2;
+                    }
+                }
+
+                for (int j = 0; j < 8; j++) {
+                    mean[j] = mean2[j];
+                }
+
+
+
+                System.out.println(names[i] + " :");
 				System.out.println("Mean of max " + mean[i] + " Var of maxs " + variance[i]);
 				meanOfMax.put(names[i], mean[i]);
 
 				System.out.println("Prob " + mean[i] * (1-variance[i]*10) );
 				probsMap.put(names[i], mean[i] * (1-variance[i]*10));
 				mean[i] = StatUtils.mean(array2);
 				variance[i] = StatUtils.variance(array2);// variance
+
+                mean2 = new double[8];
+                proceed = new boolean[]{false, false, false, false, false,false,false,false};
+                for (int j = 0; j < 8; j++) {
+                    double min = mean[0];
+                    int mininx = 0;
+                    boolean good = false;
+                    for (int k = 0; k < 8; k++) {
+                        if (mean[k] < min &&  !proceed[k])
+                        {
+                            min = mean[k];
+                            mininx = k;
+                            good = true;
+                        }
+                    }
+                    if (!proceed[0] && good) {
+                        proceed[mininx] = true;
+                        double min2 = mean[0];
+                        int mininx2 = 0;
+                        good = false;
+                        for (int k = 0; k < 8; k++) {
+                            if (!proceed[k] && mean[k] < min2) {
+                                min2 = mean[k];
+                                mininx2 = k;
+                                good = true;
+                            }
+                        }
+                        mean2[mininx2] =mean[mininx2] + ( mean[mininx2] - mean[mininx])*2;
+                    }
+                }
+
+                for (int j = 0; j < 8; j++) {
+                                 mean[j] = mean2[j];
+                }
+
+
+
+
 				System.out.println("Mean of vars " + mean[i] + " Var of vars" + variance[i]);
 				meanOfVars.put(names[i], mean[i]);
 				varOfMaxs.put(names[i], mean[i] * (1- variance[i]*100));