Skip to content

Commit ac79915

Browse files
committed
bugfix in random sampling: extended timeout
1 parent c15daec commit ac79915

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

src/main/java/vevos/feature/sampling/FeatureIDESampler.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
import de.ovgu.featureide.fm.core.analysis.cnf.CNF;
44
import de.ovgu.featureide.fm.core.analysis.cnf.LiteralSet;
55
import de.ovgu.featureide.fm.core.analysis.cnf.formula.FeatureModelFormula;
6+
import de.ovgu.featureide.fm.core.analysis.cnf.generator.configuration.AConfigurationGenerator;
67
import de.ovgu.featureide.fm.core.analysis.cnf.generator.configuration.IConfigurationGenerator;
78
import de.ovgu.featureide.fm.core.analysis.cnf.generator.configuration.RandomConfigurationGenerator;
89
import de.ovgu.featureide.fm.core.base.IFeatureModel;
910
import de.ovgu.featureide.fm.core.job.LongRunningWrapper;
1011
import de.ovgu.featureide.fm.core.job.monitor.NullMonitor;
1112
import vevos.feature.Variant;
1213
import vevos.feature.config.FeatureIDEConfiguration;
14+
import vevos.util.fide.FeatureModelUtils;
1315
import vevos.util.names.NameGenerator;
1416
import vevos.util.names.NumericNameGenerator;
1517

@@ -24,9 +26,17 @@ public class FeatureIDESampler implements Sampler {
2426
private NameGenerator variantNameGenerator;
2527

2628
public static FeatureIDESampler CreateRandomSampler(final int size) {
29+
return CreateRandomSampler(size, FeatureModelUtils.HOUR);
30+
}
31+
32+
public static FeatureIDESampler CreateRandomSampler(final int size, final int timeoutInMilliseconds) {
2733
return new FeatureIDESampler(
2834
size,
29-
cnf -> new RandomConfigurationGenerator(cnf, size)
35+
cnf -> {
36+
final AConfigurationGenerator randomSampler = new RandomConfigurationGenerator(cnf, size);
37+
randomSampler.setTimeout(timeoutInMilliseconds);
38+
return randomSampler;
39+
}
3040
);
3141
}
3242

src/main/java/vevos/util/fide/FeatureModelUtils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import java.util.stream.Collectors;
1717

1818
public class FeatureModelUtils {
19+
public static int HOUR = 1000 * 60 * 60;
20+
1921
public static IFeatureModel CreateEmptyFeatureModel() {
2022
return DefaultFeatureModelFactory.getInstance().create();
2123
}

0 commit comments

Comments
 (0)