Changeset 31402 in osm for applications/editors/josm/plugins/OSMRecPlugin

Timestamp:

2015-07-24T19:43:34+02:00 (9 years ago)

Author:

nkaragiannakis

Message:

bugFix for files extraction

Location:

applications/editors/josm/plugins/OSMRecPlugin

Files:

• build.xml (modified) (1 diff)
• lib/log4j-1.2.17.jar (deleted)
• lib/turnrestrictions.jar (deleted)
• nbproject/private/private.xml (modified) (1 diff)
• nbproject/project.xml (modified) (1 diff)
• resources/files/best_model (added)
• resources/files/model_with_classes (added)
• src/org/openstreetmap/josm/plugins/extractor/LanguageDetector.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/extractor/SampleModelsExtractor.java (added)
• src/org/openstreetmap/josm/plugins/extractor/TextualListLoader.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/osmrec/OSMRecPluginHelper.java (modified) (10 diffs)
• src/org/openstreetmap/josm/plugins/parsers/Mapper.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/parsers/Ontology.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/parsers/TextualStatistics.java (modified) (2 diffs)

applications/editors/josm/plugins/OSMRecPlugin/build.xml

@@ -25 +25 @@
     <!--<property name="plugin.stage" value="..."/>-->
     
+    
+    <!-- temporary out
         <property name="josm" location="../../core/dist/josm-custom.jar"/>
         <property name="plugin.dist.dir" value="../../dist"/>
-        
+    -->
+    
     <!-- ** include targets that all plugins have in common ** -->
    <!-- <import file="build-common.xml"/>-->

applications/editors/josm/plugins/OSMRecPlugin/nbproject/private/private.xml

@@ -4 +4 @@
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/home/imis-nkarag/software/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/MenuExportAction.java</file>
-            <file>file:/home/imis-nkarag/software/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/OSMRecPlugin.java</file>
+            <file>file:/home/imis-nkarag/software/josm_svn/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/OSMRecPlugin.java</file>
+            <file>file:/home/imis-nkarag/software/josm_svn/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/MenuExportAction.java</file>
         </group>
     </open-files>

applications/editors/josm/plugins/OSMRecPlugin/nbproject/project.xml

@@ -81 +81 @@
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">../../core/dist/josm-custom.jar:lib/log4j-1.2.17.jar:lib/liblinear-java-1.95.jar:lib/jena-core-2.12.0.jar:lib/jts-1.13.jar:lib/gt-api-9.3.jar:lib/gt-referencing-9.3.jar:lib/gt-opengis-9.3.jar:lib/gt-metadata-9.3.jar:lib/slf4j-api-1.7.6.jar:lib/xercesImpl-2.11.0.jar:lib/commons-lang3-3.3.2.jar:lib/commons-pool-1.5.4.jar:lib/gt-api-9.3.jar:lib/gt-metadata-9.3.jar:lib/gt-opengis-9.3.jar:lib/gt-referencing-9.3.jar:lib/jai_core-1.1.3.jar:lib/jena-core-2.12.0.jar:lib/jena-iri-1.1.0.jar:lib/jgridshift-1.0.jar:lib/jsonic-1.2.7.jar:lib/jsr-275-1.0-beta-2.jar:lib/jts-1.13.jar:lib/langdetect-1.1-20120112.jar:lib/liblinear-1.95.jar:lib/liblinear-java-1.95.jar:lib/lucene-analyzers-3.6.0.jar:lib/lucene-core-3.6.0.jar:lib/slf4j-api-1.7.6.jar:lib/slf4j-log4j12-1.7.6.jar:lib/vecmath-1.3.2.jar:lib/xercesImpl-2.11.0.jar:lib/xml-apis-1.4.01.jar</classpath>
+                <classpath mode="compile">../../core/dist/josm-custom.jar:lib/liblinear-java-1.95.jar:lib/jena-core-2.12.0.jar:lib/gt-api-9.3.jar:lib/gt-referencing-9.3.jar:lib/gt-opengis-9.3.jar:lib/gt-metadata-9.3.jar:lib/slf4j-api-1.7.6.jar:lib/xercesImpl-2.11.0.jar:lib/commons-lang3-3.3.2.jar:lib/commons-pool-1.5.4.jar:lib/gt-api-9.3.jar:lib/gt-metadata-9.3.jar:lib/gt-opengis-9.3.jar:lib/gt-referencing-9.3.jar:lib/jai_core-1.1.3.jar:lib/jena-core-2.12.0.jar:lib/jena-iri-1.1.0.jar:lib/jgridshift-1.0.jar:lib/jsonic-1.2.7.jar:lib/jsr-275-1.0-beta-2.jar:lib/langdetect-1.1-20120112.jar:lib/liblinear-1.95.jar:lib/liblinear-java-1.95.jar:lib/lucene-analyzers-3.6.0.jar:lib/lucene-core-3.6.0.jar:lib/slf4j-api-1.7.6.jar:lib/slf4j-log4j12-1.7.6.jar:lib/vecmath-1.3.2.jar:lib/xercesImpl-2.11.0.jar:lib/xml-apis-1.4.01.jar:lib/jts-1.13.jar</classpath>
                 <built-to>../../dist</built-to>
                 <source-level>1.7</source-level>

applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/extractor/LanguageDetector.java

@@ -43 +43 @@
 
         if(!new File(languageProfilesPath).exists()){
-            new File(languageProfilesPath).mkdir();
+            //new File(languageProfilesPath).mkdir();
+            new File(languageProfilesPath).mkdirs();
         }
-        File languageProfilesOutputFile1 = new File(languageProfilesPath + "/el");
+        File languageProfilesOutputFile1 = new File(languageProfilesPath + "/el");        
         File languageProfilesOutputFile2 = new File(languageProfilesPath +"/en");
+        
+        try {
+            System.out.println("languageProfilesOutputFile1.exists: " + languageProfilesOutputFile1.exists());
+            System.out.println("languageProfilesOutputFile1.getAbsolutePath(): " + languageProfilesOutputFile1.getAbsolutePath());
+            System.out.println("languageProfilesOutputFile1.canRead(): " + languageProfilesOutputFile1.canRead());
+            System.out.println("languageProfilesOutputFile1.canWrite(): " + languageProfilesOutputFile1.canWrite());
+            //System.out.println("languageProfilesOutputFile1.canRead(): " + languageProfilesOutputFile1.);
+            
+            languageProfilesOutputFile1.createNewFile();
+            languageProfilesOutputFile2.createNewFile();
+        } catch (IOException ex) {
+            Logger.getLogger(LanguageDetector.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        
         //languageProfilesOutputFile.mkdirs();
 
@@ -57 +72 @@
             Logger.getLogger(LanguageDetector.class.getName()).log(Level.SEVERE, null, ex);
         }
-        System.out.println("deb1");
+        //System.out.println("deb1");
 
         FileOutputStream outputStream2 = null;

applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/extractor/TextualListLoader.java

@@ -8 +8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+//import org.apache.log4j.Logger;
 
 /**
@@ -18 +19 @@
 public class TextualListLoader {
     
-    private static final org.apache.log4j.Logger LOG = org.apache.log4j.Logger.getLogger(TextualListLoader.class);
+    //private static final org.apache.log4j.Logger LOG = org.apache.log4j.Logger.getLogger(TextualListLoader.class);
+    //private static final Logger LOG = Logger.getLogger(TextualListLoader.class);
     private List<String> namesList;
     
@@ -36 +38 @@
                 namesList.add(nextLine);
             }
-        LOG.info("Name occurences parsed successfully!");
+        //LOG.info("Name occurences parsed successfully!");
         }
         

applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/osmrec/OSMRecPluginHelper.java

@@ -126 +126 @@
 import org.openstreetmap.josm.plugins.core.TrainWorker;
 import org.openstreetmap.josm.plugins.extractor.LanguageDetector;
+import org.openstreetmap.josm.plugins.extractor.SampleModelsExtractor;
 import org.openstreetmap.josm.plugins.features.ClassFeatures;
 import org.openstreetmap.josm.plugins.features.GeometryFeatures;
@@ -159 +160 @@
     private static String MODEL_PATH;
     private static String TEXTUAL_LIST_PATH;
-
+    private static Map<String, List<String>> indirectClasses;
+    private static Map<String, Integer> indirectClassesWithIDs;
+    private static LanguageDetector languageDetector;
+    private static String bestModelPath;
+    private final String modelWithClassesPath;
+    
+    
     // Selection that we are editing by using both dialogs
     Collection<OsmPrimitive> sel;
@@ -186 +193 @@
         }
     };
+
     
-    private static Map<String, List<String>> indirectClasses;
-    private static Map<String, Integer> indirectClassesWithIDs;
-    private static LanguageDetector languageDetector;
-
     OSMRecPluginHelper(DefaultTableModel propertyData, Map<String, Map<String, Integer>> valueCount) {
         this.tagData = propertyData;
@@ -203 +207 @@
         MODEL_PATH = new File(MAIN_PATH).getParentFile() + "/OSMRec_models";
         TEXTUAL_LIST_PATH = MODEL_PATH + "/textualList.txt";
+        bestModelPath = MODEL_PATH + "/best_model";
+        modelWithClassesPath = MODEL_PATH + "/model_with_classes";
         languageDetector = LanguageDetector.getInstance(MODEL_PATH + "/profiles");
+
+        SampleModelsExtractor sa = new SampleModelsExtractor();
+        
+        sa.extractSampleSVMmodel("best_model", bestModelPath);
+        sa.extractSampleSVMmodel("model_with_classes", modelWithClassesPath);
+        
     }
 
@@ -1483 +1495 @@
             configureContextsensitiveHelp("/Dialog/AddValue", true /* show help button */);
             final AddTagsDialog lala = this;
+
             
             loadOntology();
@@ -1497 +1510 @@
             }
             
-           
+            //if training process has not been performed, we use two sample SVM models, extracted from the jar
+            //File bestModelFile = new File(bestModelPath);
+            //File bestModelWithClassesFile = new File(modelWithClassesPath);
 
             JPanel splitPanel = new JPanel(new BorderLayout(10,10));            
@@ -1629 +1644 @@
             //get a simple selection
             if(!osmPrimitiveSelection.isEmpty()){
-                s = osmPrimitiveSelection.get(0);                       
-                if(s.getInterestingTags().isEmpty()){
+                s = osmPrimitiveSelection.get(0);     
+                File modelDirectory = new File(MODEL_PATH);
+                String modelWithClassesPath = modelDirectory.getAbsolutePath() + "/model_with_classes";
+                File modelWithClassesFile = new File(modelWithClassesPath); 
+                if(s.getInterestingTags().isEmpty() || !modelWithClassesFile.exists()){
                     loadSVMmodel(false);//load original model
                     createOSMObject(sel, false); //create object without class features
@@ -1650 +1668 @@
                 public void valueChanged(ListSelectionEvent listSelectionEvent) {
                     if (!listSelectionEvent.getValueIsAdjusting()) {//This prevents double events
-                        System.out.println("tag selected: " + categoryList.getSelectedValue());
+                        //System.out.println("tag selected: " + categoryList.getSelectedValue());
                         
                         String selectedClass = categoryList.getSelectedValue();
@@ -2094 +2112 @@
 
                         mapLabelsToIDs.put(modelSVMLabels[h], h);
-                        System.out.println(h + "   <->    " + modelSVMLabels[h]);
+                        //System.out.println(h + "   <->    " + modelSVMLabels[h]);
 
                     } 
@@ -2211 +2229 @@
                     }
                 }
-                System.out.println("final list:" + scoreMap);
+                //System.out.println("final list:" + scoreMap);
             }           
         }

applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/parsers/Mapper.java

@@ -4 +4 @@
 import java.io.FileNotFoundException;
 import java.io.InputStream;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Scanner;
@@ -17 +19 @@
 
 public class Mapper {
-    private static final org.apache.log4j.Logger LOG = org.apache.log4j.Logger.getLogger(Mapper.class);
+    //private static final org.apache.log4j.Logger LOG = org.apache.log4j.Logger.getLogger(Mapper.class);
     private final HashMap<String, String> mappings;
     private final HashMap<String, Integer> mappingsWithIDs;
@@ -23 +25 @@
     public Mapper(){    
     
-       mappings = new HashMap<>();
+       mappings = new LinkedHashMap<>();
        mappingsWithIDs = new HashMap<>();
     
@@ -45 +47 @@
         }
         constructMappingsWithIDs();
-         
-    LOG.info("Mappings file parsed successfully!");     
+        System.out.println("Mappings file parsed successfully!");
+        //LOG.info("Mappings file parsed successfully!");     
     } 
     
@@ -58 +60 @@
     
     public Map<String,Integer> getMappingsWithIDs(){
-        return this.mappingsWithIDs;
+        return Collections.unmodifiableMap(mappingsWithIDs);
     }
     
     public Map<String,String> getMappings(){
-        return this.mappings;
+        return Collections.unmodifiableMap(mappings);
     }        
 }

applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/parsers/Ontology.java

@@ -50 +50 @@
         ontologyModel = ModelFactory.createOntologyModel();                
         
-        org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.ERROR); 
+        //org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.ERROR); 
         ontologyModel.read(owlFile, null);    //Hide RDFDefaultErrorHandler from terminal to keep clear output.
-        org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.INFO);
+        //org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.INFO);
    
         listHierarchy = ontologyModel.listHierarchyRootClasses().toList();
         setListHierarchy(listHierarchy);  
         
-        ExtendedIterator classes = ontologyModel.listClasses();
+        ExtendedIterator<OntClass> classes = ontologyModel.listClasses();
         while (classes.hasNext()) {
             String className;
-            OntClass obj = (OntClass) classes.next();           
+            OntClass obj = classes.next();           
             
             //compare localname with class name from map and call getSuperclass     

applications/editors/josm/plugins/OSMRecPlugin/src/org/openstreetmap/josm/plugins/parsers/TextualStatistics.java

@@ -3 +3 @@
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Scanner;
@@ -30 +31 @@
         
         public List<String> getTextualList(){
-            return textualList;
+            return Collections.unmodifiableList(textualList);
         }
 }