Changeset 1008 for trunk

Timestamp:

09/25/11 19:12:38 (13 years ago)

Author:

vasaie_p

Message:

 

Location:

trunk/modelicaml/org.openmodelica.modelicaml.simulation/src/org/openmodelica/modelicaml/simulation/evaluation

Files:

• EvaluateResultXML.java (modified) (7 diffs)
• ParseJavaScript.java (added)

trunk/modelicaml/org.openmodelica.modelicaml.simulation/src/org/openmodelica/modelicaml/simulation/evaluation/EvaluateResultXML.java

@@ -5 +5 @@
 import org.openmodelica.modelicaml.simulation.xml.SimulationResult_XML_reader;
 
+/**
+ * Class to evaluate results of a given property to a condition
+ * @author parham.vasaiely
+ *
+ */
 public class EvaluateResultXML {
-    
-//  - [atLeastOneTimeTrue], 
-//  - [atLeastOneTimeFalse], 
-//  - [alwaysTrue], 
-//  - [alwaysFalse], 
-//  - [changedItsValue]
     
     /**
@@ -18 +17 @@
      * @param result xml file
      */
-    public static String checkAtLeastOneTimeTrue(String propertyName, File xml_file){
+    private static String checkAtLeastOneTimeTrue(String propertyName, File xml_file){
         if(!xml_file.exists())
             return "fileNotFound";
@@ -40 +39 @@
      * @param result xml file
      */
-    public static String checkAtLeastOneTimeFalse(String propertyName, File xml_file){
+    private static String checkAtLeastOneTimeFalse(String propertyName, File xml_file){
         if(!xml_file.exists())
             return "fileNotFound";
@@ -62 +61 @@
      * @param result xml file
      */
-    public static String checkAlwaysTrue(String propertyName, File xml_file){
+    private static String checkAlwaysTrue(String propertyName, File xml_file){
         if(!xml_file.exists())
             return "fileNotFound";
@@ -84 +83 @@
      * @param result xml file
      */
-    public static String checkAlwaysFalse(String propertyName, File xml_file){
+    private static String checkAlwaysFalse(String propertyName, File xml_file){
         if(!xml_file.exists())
             return "fileNotFound";
@@ -106 +105 @@
      * @param result xml file
      */
-    public static String checkChangedItsValue(String propertyName, File xml_file){
+    private static String checkChangedItsValue(String propertyName, File xml_file){
         if(!xml_file.exists())
             return "fileNotFound";
@@ -128 +127 @@
         }
             return "true";
+    }
+    
+    /**
+     * Evaluates the results of a property using a given check mode
+     * @param propertyName name of the property which is going to be evaluated
+     * @param checkMode used to evaluate the results of a property, the following check modes are allowed: atLeastOneTimeTrue, atLeastOneTimeFalse, alwaysTrue, alwaysFalse, changedItsValue
+     * @param result_xml_file absolut path to the results XML
+     * @return result of the evaluation as a String, the result can be: true, false, resultsNotfound, fileNotFound, checkModeUnknow
+     */
+    public static String evaluateProperty(String propertyName, String checkMode, String result_xml_file){
+        File xmlResultFile = new File(result_xml_file);
+        try{
+            if(!xmlResultFile.exists() || !xmlResultFile.canRead())
+                return "fileNotFound";
+        }catch (Exception e) {
+            // TODO: handle exception
+        }
+        
+        if(checkMode.equals("atLeastOneTimeTrue"))
+            return checkAtLeastOneTimeTrue(propertyName, xmlResultFile);        
+        if(checkMode.equals("atLeastOneTimeFalse"))
+            return checkAtLeastOneTimeFalse(propertyName, new File(result_xml_file));
+        if(checkMode.equals("alwaysTrue"))
+            return checkAlwaysTrue(propertyName, new File(result_xml_file));
+        if(checkMode.equals("alwaysFalse"))
+            return checkAlwaysFalse(propertyName, new File(result_xml_file));
+        if(checkMode.equals("changedItsValue"))
+            return checkChangedItsValue(propertyName, new File(result_xml_file));
+        else
+            return "checkModeUnknow";
     }