Changeset 27 for trunk/CrossPare/src/de/ugoe/cs

Timestamp:

01/26/15 11:43:30 (10 years ago)

Author:

sherbold

Message:

• updated experiment and SoftwareVersion? such that the order of the results will now always be the same and not depend on the order of the data loading. Instead, it depends on the string-order of the projects and versions that are loaded.

Location:

trunk/CrossPare/src/de/ugoe/cs/cpdp

Files:

• Experiment.java (modified) (2 diffs)
• versions/SoftwareVersion.java (modified) (2 diffs)

trunk/CrossPare/src/de/ugoe/cs/cpdp/Experiment.java

@@ -2 +2 @@
 
 import java.io.File;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -90 +91 @@
                 }
                 
+                // sort versions
+                Collections.sort(versions);
+                
                 for( SoftwareVersion testVersion : versions ) {
                         if( isVersion(testVersion, config.getTestVersionFilters()) ) {

trunk/CrossPare/src/de/ugoe/cs/cpdp/versions/SoftwareVersion.java

@@ -7 +7 @@
  * @author Steffen Herbold
  */
-public class SoftwareVersion {
+public class SoftwareVersion implements Comparable<SoftwareVersion> {
 
         /**
@@ -59 +59 @@
                 return new Instances(instances);
         }
+
+        /** 
+         * Compares first based on project name and then based on version. Only string comparisons are performed. 
+         * @see java.lang.Comparable#compareTo(java.lang.Object)
+         */
+        @Override
+        public int compareTo(SoftwareVersion o) {
+                int projectStrCmp = 0;
+                if( project!=null ) {
+                        projectStrCmp = project.compareTo(o.project);
+                } 
+                if( projectStrCmp==0 && version!=null ) {
+                        return version.compareTo(o.version);                    
+                } else {
+                        return projectStrCmp;
+                }
+        }
 }