Changeset 65
- Timestamp:
- 04/29/16 14:29:52 (9 years ago)
- Location:
- trunk/CrossPare/src/de/ugoe/cs/cpdp
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CrossPare/src/de/ugoe/cs/cpdp/ExperimentConfiguration.java
r45 r65 42 42 import de.ugoe.cs.cpdp.training.ISetWiseTestdataAwareTrainingStrategy; 43 43 import de.ugoe.cs.cpdp.training.ISetWiseTrainingStrategy; 44 import de.ugoe.cs.cpdp.training.ITestAwareTrainingStrategy; 44 45 import de.ugoe.cs.cpdp.training.ITrainingStrategy; 45 46 import de.ugoe.cs.cpdp.versions.IVersionFilter; … … 139 140 */ 140 141 private List<ITrainingStrategy> trainers; 142 143 /** 144 * normal trainers, i.e., trainers that require the selected training data in a single data set 145 */ 146 private List<ITestAwareTrainingStrategy> testAwareTrainers; 141 147 142 148 /** … … 376 382 return trainers; 377 383 } 384 385 /** 386 * returns the test aware training algorithms 387 * 388 * @return normal training algorithms 389 */ 390 public List<ITestAwareTrainingStrategy> getTestAwareTrainers() { 391 return testAwareTrainers; 392 } 378 393 379 394 /** … … 524 539 trainer.setParameter(attributes.getValue("param")); 525 540 trainers.add(trainer); 541 } 542 else if (qName.equals("testawaretrainer")) { 543 final ITestAwareTrainingStrategy trainer = 544 (ITestAwareTrainingStrategy) Class.forName("de.ugoe.cs.cpdp.training." + 545 attributes.getValue("name")) 546 .newInstance(); 547 trainer.setParameter(attributes.getValue("param")); 548 testAwareTrainers.add(trainer); 526 549 } 527 550 else if (qName.equals("eval")) { -
trunk/CrossPare/src/de/ugoe/cs/cpdp/execution/CrossProjectExperiment.java
r44 r65 33 33 import de.ugoe.cs.cpdp.training.ISetWiseTestdataAwareTrainingStrategy; 34 34 import de.ugoe.cs.cpdp.training.ISetWiseTrainingStrategy; 35 import de.ugoe.cs.cpdp.training.ITestAwareTrainingStrategy; 35 36 import de.ugoe.cs.cpdp.training.ITrainer; 36 37 import de.ugoe.cs.cpdp.training.ITrainingStrategy; … … 206 207 trainer.apply(traindata); 207 208 } 209 for (ITestAwareTrainingStrategy trainer : config.getTestAwareTrainers()) { 210 Console.traceln(Level.FINE, String 211 .format("[%s] [%02d/%02d] %s: applying trainer %s", 212 config.getExperimentName(), versionCount, testVersionCount, 213 testVersion.getVersion(), trainer.getName())); 214 trainer.apply(testdata, traindata); 215 } 208 216 File resultsDir = new File(config.getResultsPath()); 209 217 if (!resultsDir.exists()) { … … 223 231 } 224 232 for (ITrainingStrategy trainer : config.getTrainers()) { 233 allTrainers.add(trainer); 234 } 235 for (ITestAwareTrainingStrategy trainer : config.getTestAwareTrainers()) { 225 236 allTrainers.add(trainer); 226 237 } -
trunk/CrossPare/src/de/ugoe/cs/cpdp/execution/RelaxedCrossProjectExperiment.java
r44 r65 33 33 import de.ugoe.cs.cpdp.training.ISetWiseTestdataAwareTrainingStrategy; 34 34 import de.ugoe.cs.cpdp.training.ISetWiseTrainingStrategy; 35 import de.ugoe.cs.cpdp.training.ITestAwareTrainingStrategy; 35 36 import de.ugoe.cs.cpdp.training.ITrainer; 36 37 import de.ugoe.cs.cpdp.training.ITrainingStrategy; … … 211 212 trainer.apply(traindata); 212 213 } 214 for (ITestAwareTrainingStrategy trainer : config.getTestAwareTrainers()) { 215 Console.traceln(Level.FINE, String 216 .format("[%s] [%02d/%02d] %s: applying trainer %s", 217 config.getExperimentName(), versionCount, testVersionCount, 218 testVersion.getVersion(), trainer.getName())); 219 trainer.apply(testdata, traindata); 220 } 213 221 File resultsDir = new File(config.getResultsPath()); 214 222 if (!resultsDir.exists()) { … … 224 232 allTrainers.add(setwiseTrainer); 225 233 } 234 for (ISetWiseTestdataAwareTrainingStrategy setwiseTrainer : config.getSetWiseTestdataAwareTrainers()) { 235 allTrainers.add(setwiseTrainer); 236 } 226 237 for (ITrainingStrategy trainer : config.getTrainers()) { 238 allTrainers.add(trainer); 239 } 240 for (ITestAwareTrainingStrategy trainer : config.getTestAwareTrainers()) { 227 241 allTrainers.add(trainer); 228 242 }
Note: See TracChangeset
for help on using the changeset viewer.