Skip to content

Commit 51caa62

Browse files
pmbittnerpmbittner
committed
consistent renaming
1 parent 40def7d commit 51caa62

File tree

112 files changed

+533
-509
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+533
-509
lines changed

‎README.md‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ In the following we give a step by step example in how the library can be used t
1717
- generate variants for each step in the evolution history,
1818
- obtain the ground truth of generated variants.
1919

20-
The example's source code can also be found in [GenerationExample.java](src/main/java/simulation/examples/GenerationExample.java).
21-
A similar and executable version of this example can be found in [VEVOSBenchmark.java](src/main/java/simulation/examples/VEVOSBenchmark.java), which gathers some rudimentary data on runtime performance for Linux and Busybox variant simulation.
20+
The example's source code can also be found in [GenerationExample.java](src/main/java/org/variantsync/vevos/simulation/examples/GenerationExample.java).
21+
A similar and executable version of this example can be found in [VEVOSBenchmark.java](src/main/java/org/variantsync/vevos/simulation/examples/VEVOSBenchmark.java), which gathers some rudimentary data on runtime performance for Linux and Busybox variant simulation.
2222

2323
At the very begin of your program, you have to initialize the library:
2424
```java
@@ -82,13 +82,13 @@ Thus, the sampler can be invoked during each step of the variant simulation.
8282
Apart from the possibility of introducing custom samplers, VEVOS/Simulation comes with two built-in ways for sampling:
8383
Random configuration sampling using the FeatureIDE library, and constant sampling.
8484

85-
[Random sampling](src/main/java/simulation/feature/sampling/FeatureIDESampler.java) returns a random set of valid configurations from a given feature model:
85+
[Random sampling](src/main/java/org/variantsync/vevos/simulation/feature/sampling/FeatureIDESampler.java) returns a random set of valid configurations from a given feature model:
8686
```java
8787
/// Either use random sampling, ...
8888
final int numberOfVariantsToGenerate = 42;
8989
Sampler variantsSampler = FeatureIDESampler.CreateRandomSampler(numberOfVariantsToGenerate);
9090
```
91-
[Constant sampling](src/main/java/simulation/feature/sampling/ConstSampler.java) uses a pre-defined set of variants and ignores the feature model (it can easily be extended though to for example crash if a configuration violates a feature model at any commit):
91+
[Constant sampling](src/main/java/org/variantsync/vevos/simulation/feature/sampling/ConstSampler.java) uses a pre-defined set of variants and ignores the feature model (it can easily be extended though to for example crash if a configuration violates a feature model at any commit):
9292
```java
9393
/// ... or use a predefined set of variants.
9494
final Sample variantsToGenerate = new Sample(List.of(
@@ -205,19 +205,19 @@ This was round-trip about the major features of VEVOS/Simulation.
205205
## Project Structure
206206

207207
The project is structured into the following packages:
208-
- [`vevos.examples`](src/main/java/simulation/examples) contains the code of our example described above
209-
- [`vevos.feature`](src/main/java/simulation/feature) contains our representation for `Variant`s and their `Configuration`s as well as sampling of configurations and variants
210-
- [`vevos.io`](src/main/java/simulation/io) contains our `Resources` service and default implementations for loading `CSV` files, ground truth, feature models, and configurations
211-
- [`vevos.repository`](src/main/java/simulation/repository) contains classes for representing git repositories and commits
212-
- [`vevos.sat`](src/main/java/simulation/sat) contains an interface for SAT solving (currently only used for annotation simplification, which is deactivated by default)
213-
- [`vevos.util`](src/main/java/simulation/util) is the conventional utils package with helper methods for interfacing with FeatureIDE, name generation, logging, and others.
214-
- [`vevos.variability`](src/main/java/simulation/variability) contains the classes for representing evolution histories and the ground truth dataset.
208+
- [`vevos.examples`](src/main/java/org/variantsync/vevos/simulation/examples) contains the code of our example described above
209+
- [`vevos.feature`](src/main/java/org/variantsync/vevos/simulation/feature) contains our representation for `Variant`s and their `Configuration`s as well as sampling of configurations and variants
210+
- [`vevos.io`](src/main/java/org/variantsync/vevos/simulation/io) contains our `Resources` service and default implementations for loading `CSV` files, ground truth, feature models, and configurations
211+
- [`vevos.repository`](src/main/java/org/variantsync/vevos/simulation/repository) contains classes for representing git repositories and commits
212+
- [`vevos.sat`](src/main/java/org/variantsync/vevos/simulation/sat) contains an interface for SAT solving (currently only used for annotation simplification, which is deactivated by default)
213+
- [`vevos.util`](src/main/java/org/variantsync/vevos/simulation/util) is the conventional utils package with helper methods for interfacing with FeatureIDE, name generation, logging, and others.
214+
- [`vevos.variability`](src/main/java/org/variantsync/vevos/simulation/variability) contains the classes for representing evolution histories and the ground truth dataset.
215215
The package is divided into:
216-
- [`vevos.variability.pc`](src/main/java/simulation/variability/pc) contains classes for representing annotations (i.e., presence conditions and feature mappings). We store annotations in `Artefact`s that follow a tree structure similar to the annotations in preprocessor based software product lines.
217-
- [`vevos.variability.pc.groundtruth`](src/main/java/simulation/variability/pc/groundtruth) contains datatypes for the ground truth of generated variants.
218-
- [`vevos.variability.pc.options`](src/main/java/simulation/variability/pc/options) contains the options for the variant generation process.
219-
- [`vevos.variability.pc.visitor`](src/main/java/simulation/variability/pc/visitor) contains an implementation of the visitor pattern for traversing and inspecting `ArtefactTree`s. Some visitors for querying a files or a line's presence condition, as well as a pretty printer can be found in [`vevos.variability.pc.visitor.common`](src/main/java/simulation/variability/pc/visitor/common).
220-
- [`vevos.variability.sequenceextraction`](src/main/java/simulation/variability/sequenceextraction) contains default implementations for `SequenceExtractor`. These are algorithms for sorting pairs of commits into continuous histories (see example above).
216+
- [`vevos.variability.pc`](src/main/java/org/variantsync/vevos/simulation/variability/pc) contains classes for representing annotations (i.e., presence conditions and feature mappings). We store annotations in `Artefact`s that follow a tree structure similar to the annotations in preprocessor based software product lines.
217+
- [`vevos.variability.pc.groundtruth`](src/main/java/org/variantsync/vevos/simulation/variability/pc/groundtruth) contains datatypes for the ground truth of generated variants.
218+
- [`vevos.variability.pc.options`](src/main/java/org/variantsync/vevos/simulation/variability/pc/options) contains the options for the variant generation process.
219+
- [`vevos.variability.pc.visitor`](src/main/java/org/variantsync/vevos/simulation/variability/pc/visitor) contains an implementation of the visitor pattern for traversing and inspecting `ArtefactTree`s. Some visitors for querying a files or a line's presence condition, as well as a pretty printer can be found in [`vevos.variability.pc.visitor.common`](src/main/java/org/variantsync/vevos/simulation/variability/pc/visitor/common).
220+
- [`vevos.variability.sequenceextraction`](src/main/java/org/variantsync/vevos/simulation/variability/sequenceextraction) contains default implementations for `SequenceExtractor`. These are algorithms for sorting pairs of commits into continuous histories (see example above).
221221

222222
## Setup
223223

‎maven-scripts/build-local-repo.sh‎

100644100755
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ mvn install:install-file \
99

1010
mvn install:install-file \
1111
-DlocalRepositoryPath=../repo \
12-
-Dfile=../src/main/resources/lib/Functjonal-1.0-SNAPSHOT.jar \
13-
-DgroupId=vevos \
12+
-Dfile=../src/main/resources/lib/functjonal-1.0-SNAPSHOT.jar \
13+
-DgroupId=org.variantsync \
1414
-DartifactId=functjonal \
15-
-Dversion=1.0.0 \
15+
-Dversion=1.0-SNAPSHOT \
1616
-Dpackaging=jar \
1717
-DgeneratePom=true
1818

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<!-- Adjust group id for anonymous projects -->
8-
<groupId>de.variantsync.vevos</groupId>
8+
<groupId>org.variantsync.vevos</groupId>
99
<!-- Adjust the generateVariant name -->
1010
<artifactId>Simulation</artifactId>
1111
<version>1.0.0</version>
@@ -65,9 +65,9 @@
6565
<dependencies>
6666
<!-- Local dependencies-->
6767
<dependency>
68-
<groupId>vevos</groupId>
68+
<groupId>org.variantsync</groupId>
6969
<artifactId>functjonal</artifactId>
70-
<version>1.0.0</version>
70+
<version>1.0-SNAPSHOT</version>
7171
</dependency>
7272

7373
<dependency>

‎repo/org/variantsync/functjonal/1.0-SNAPSHOT/functjonal-1.0-SNAPSHOT.jar‎

43.8 KB
Binary file not shown.

‎repo/vevos/functjonal/1.0.0/functjonal-1.0.0.pom‎ renamed to ‎repo/org/variantsync/functjonal/1.0-SNAPSHOT/functjonal-1.0-SNAPSHOT.pom‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
44
<modelVersion>4.0.0</modelVersion>
5-
<groupId>vevos</groupId>
5+
<groupId>org.variantsync</groupId>
66
<artifactId>functjonal</artifactId>
7-
<version>1.0.0</version>
7+
<version>1.0-SNAPSHOT</version>
88
<description>POM was created from install:install-file</description>
99
</project>

‎repo/org/variantsync/functjonal/1.0-SNAPSHOT/maven-metadata-local.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<metadata modelVersion="1.1.0">
3+
<groupId>org.variantsync</groupId>
4+
<artifactId>functjonal</artifactId>
5+
<version>1.0-SNAPSHOT</version>
6+
<versioning>
7+
<snapshot>
8+
<localCopy>true</localCopy>
9+
</snapshot>
10+
<lastUpdated>20220405113508</lastUpdated>
11+
<snapshotVersions>
12+
<snapshotVersion>
13+
<extension>jar</extension>
14+
<value>1.0-SNAPSHOT</value>
15+
<updated>20220405113508</updated>
16+
</snapshotVersion>
17+
<snapshotVersion>
18+
<extension>pom</extension>
19+
<value>1.0-SNAPSHOT</value>
20+
<updated>20220405113508</updated>
21+
</snapshotVersion>
22+
</snapshotVersions>
23+
</versioning>
24+
</metadata>

‎repo/vevos/functjonal/maven-metadata-local.xml‎ renamed to ‎repo/org/variantsync/functjonal/maven-metadata-local.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<metadata>
3-
<groupId>vevos</groupId>
3+
<groupId>org.variantsync</groupId>
44
<artifactId>functjonal</artifactId>
55
<versioning>
6-
<release>1.0.0</release>
76
<versions>
8-
<version>1.0.0</version>
7+
<version>1.0-SNAPSHOT</version>
98
</versions>
10-
<lastUpdated>20220205170512</lastUpdated>
9+
<lastUpdated>20220405113508</lastUpdated>
1110
</versioning>
1211
</metadata>

‎repo/vevos/functjonal/1.0.0/functjonal-1.0.0.jar‎

-40.4 KB
Binary file not shown.

‎src/main/java/simulation/VEVOS.java‎ renamed to ‎src/main/java/org/variantsync/vevos/simulation/VEVOS.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package simulation;
1+
package org.variantsync.vevos.simulation;
22

33
import de.ovgu.featureide.fm.core.base.impl.*;
44
import de.ovgu.featureide.fm.core.configuration.*;
55
import de.ovgu.featureide.fm.core.io.sxfm.SXFMFormat;
66
import de.ovgu.featureide.fm.core.io.xml.XmlFeatureModelFormat;
7-
import simulation.util.Logger;
7+
import org.variantsync.vevos.simulation.util.Logger;
88

99
public final class VEVOS {
1010
private static boolean initialized = false;

‎src/main/java/simulation/examples/GenerationExample.java‎ renamed to ‎src/main/java/org/variantsync/vevos/simulation/examples/GenerationExample.java‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
package simulation.examples;
1+
package org.variantsync.vevos.simulation.examples;
22

33
import de.ovgu.featureide.fm.core.base.IFeatureModel;
44
import org.eclipse.jgit.api.errors.GitAPIException;
5-
import simulation.VEVOS;
6-
import simulation.feature.Variant;
7-
import simulation.feature.config.SimpleConfiguration;
8-
import simulation.feature.sampling.ConstSampler;
9-
import simulation.feature.sampling.FeatureIDESampler;
10-
import simulation.feature.sampling.Sample;
11-
import simulation.feature.sampling.Sampler;
12-
import simulation.io.Resources;
13-
import simulation.repository.BusyboxRepository;
14-
import simulation.repository.SPLRepository;
15-
import simulation.util.Logger;
16-
import simulation.util.io.CaseSensitivePath;
17-
import simulation.variability.EvolutionStep;
18-
import simulation.variability.SPLCommit;
19-
import simulation.variability.VariabilityDataset;
20-
import simulation.variability.VariabilityHistory;
21-
import simulation.variability.pc.Artefact;
22-
import simulation.variability.pc.SourceCodeFile;
23-
import simulation.variability.pc.options.ArtefactFilter;
24-
import simulation.variability.pc.options.VariantGenerationOptions;
25-
import vevos.functjonal.Lazy;
26-
import vevos.functjonal.Result;
27-
import vevos.functjonal.list.NonEmptyList;
28-
import simulation.variability.pc.groundtruth.AnnotationGroundTruth;
29-
import simulation.variability.pc.groundtruth.GroundTruth;
30-
import simulation.variability.sequenceextraction.LongestNonOverlappingSequences;
5+
import org.variantsync.functjonal.Lazy;
6+
import org.variantsync.functjonal.Result;
7+
import org.variantsync.functjonal.list.NonEmptyList;
8+
import org.variantsync.vevos.simulation.VEVOS;
9+
import org.variantsync.vevos.simulation.feature.Variant;
10+
import org.variantsync.vevos.simulation.feature.config.SimpleConfiguration;
11+
import org.variantsync.vevos.simulation.feature.sampling.ConstSampler;
12+
import org.variantsync.vevos.simulation.feature.sampling.FeatureIDESampler;
13+
import org.variantsync.vevos.simulation.feature.sampling.Sample;
14+
import org.variantsync.vevos.simulation.feature.sampling.Sampler;
15+
import org.variantsync.vevos.simulation.io.Resources;
16+
import org.variantsync.vevos.simulation.repository.BusyboxRepository;
17+
import org.variantsync.vevos.simulation.repository.SPLRepository;
18+
import org.variantsync.vevos.simulation.util.Logger;
19+
import org.variantsync.vevos.simulation.util.io.CaseSensitivePath;
20+
import org.variantsync.vevos.simulation.variability.EvolutionStep;
21+
import org.variantsync.vevos.simulation.variability.SPLCommit;
22+
import org.variantsync.vevos.simulation.variability.VariabilityDataset;
23+
import org.variantsync.vevos.simulation.variability.VariabilityHistory;
24+
import org.variantsync.vevos.simulation.variability.pc.Artefact;
25+
import org.variantsync.vevos.simulation.variability.pc.SourceCodeFile;
26+
import org.variantsync.vevos.simulation.variability.pc.groundtruth.AnnotationGroundTruth;
27+
import org.variantsync.vevos.simulation.variability.pc.groundtruth.GroundTruth;
28+
import org.variantsync.vevos.simulation.variability.pc.options.ArtefactFilter;
29+
import org.variantsync.vevos.simulation.variability.pc.options.VariantGenerationOptions;
30+
import org.variantsync.vevos.simulation.variability.sequenceextraction.LongestNonOverlappingSequences;
3131

3232
import java.io.IOException;
3333
import java.util.List;

0 commit comments

Comments
 (0)