Skip to content

Commit 3da8c2e

Browse files
committed
Fix recursion issue thrown when joining instances
1 parent 4f32704 commit 3da8c2e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

swan-pipeline/src/main/java/de/fraunhofer/iem/swan/features/MekaFeatureSet.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public void createFeatures() {
6565
ArffLoader arffLoader = new ArffLoader();
6666
arffLoader.setSource(new File(options.getArffInstancesFiles().get(x)));
6767

68-
trainingInstances = mergeInstances(trainingInstances, arffLoader.getDataSet());
69-
structure = mergeInstances(structure, arffLoader.getStructure());
68+
trainingInstances = joinInstances(trainingInstances, arffLoader.getDataSet());
69+
structure = joinInstances(structure, arffLoader.getStructure());
7070
}
7171
}
7272
} catch (IOException e) {
@@ -93,13 +93,13 @@ public void createFeatures() {
9393
* @param second instances
9494
* @return merged instances
9595
*/
96-
public Instances mergeInstances(Instances first, Instances second) {
96+
public Instances joinInstances(Instances first, Instances second) {
9797

9898
for (int c = 0; c < 12; c++) {
9999
second.renameAttribute(second.attribute(c), "b_" + second.attribute(c).name());
100100
}
101101

102-
return this.mergeInstances(first, second);
102+
return mergeInstances(first, second);
103103
}
104104

105105

swan-pipeline/src/main/java/de/fraunhofer/iem/swan/features/WekaFeatureSet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ public void createFeatures() {
118118
* @param second instances
119119
* @return merged instances
120120
*/
121-
public Instances mergeInstances(Instances first, Instances second) {
121+
public Instances joinInstances(Instances first, Instances second) {
122122

123123
//rename ID and class attributes
124124
first.renameAttribute(first.attribute(first.numAttributes() - 1), "b_" + first.attribute(first.numAttributes() - 1).name());
125125
second.renameAttribute(second.attribute(0), "b_" + second.attribute(0).name());
126126

127-
return this.mergeInstances(first, second);
127+
return mergeInstances(first, second);
128128
}
129129

130130
/**

0 commit comments

Comments
 (0)