Skip to content

Commit 4353397

Browse files
committed
YearDisambiguator fixed
1 parent 94c68a0 commit 4353397

File tree

3 files changed

+21
-10
lines changed

3 files changed

+21
-10
lines changed

disambiguation-author/disambiguation-author-logic/src/main/java/pl/edu/icm/coansys/disambiguation/author/features/disambiguators/YearDisambiguator.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,12 @@
2626
* @version 1.0
2727
* @since 2012-08-07
2828
*/
29-
public class YearDisambiguator extends Disambiguator{
29+
public class YearDisambiguator extends Disambiguator {
3030

31+
public YearDisambiguator() {
32+
super();
33+
}
34+
3135
public YearDisambiguator(double weight, double maxVal) {
3236
super(weight, maxVal);
3337
if (maxVal == 0) {

disambiguation-author/disambiguation-author-logic/src/test/java/pl/edu/icm/coansys/disambiguation/author/DisambiguationTest.java

+16-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package pl.edu.icm.coansys.disambiguation.author;
2020

21+
import org.testng.Assert;
2122
import org.testng.annotations.Test;
2223

2324
import java.util.ArrayList;
@@ -36,6 +37,7 @@
3637
import pl.edu.icm.coansys.disambiguation.author.features.disambiguators.CoAuthorsSnameDisambiguatorFullList;
3738
import pl.edu.icm.coansys.disambiguation.author.features.disambiguators.CosineSimilarity;
3839
import pl.edu.icm.coansys.disambiguation.author.features.disambiguators.Disambiguator;
40+
import pl.edu.icm.coansys.disambiguation.author.features.disambiguators.DisambiguatorFactory;
3941
import pl.edu.icm.coansys.disambiguation.author.features.disambiguators.Intersection;
4042
import pl.edu.icm.coansys.disambiguation.author.features.disambiguators.IntersectionPerMaxval;
4143
import pl.edu.icm.coansys.disambiguation.author.features.disambiguators.IntersectionPerSum;
@@ -183,6 +185,19 @@ public void pig_extractor_DisambiguationExtractorFactory_ALL()
183185
}
184186
}
185187

188+
189+
@org.testng.annotations.Test(groups = {"fast"})
190+
public void features_disambiguator_factory() {
191+
String featureDescription = "Intersection#whatever#0.0#0";
192+
List<FeatureInfo> filist = FeatureInfo.parseFeatureInfoString(featureDescription);
193+
FeatureInfo fi = filist.get(0);
194+
195+
DisambiguatorFactory ff = new DisambiguatorFactory();
196+
Disambiguator d = ff.create(fi);
197+
assert(d != null);
198+
}
199+
200+
186201
@org.testng.annotations.Test(groups = {"fast"})
187202
public void features_disambiguator_calculateAffinity() {
188203
Disambiguator COAUTH = new CoAuthorsSnameDisambiguatorFullList(1,1);
@@ -290,7 +305,7 @@ public void pig_extractor_EXTRACT_CONTRIBDATA_GIVENDATA_getting_indicators() thr
290305
// test "climbing up" through inherited tree of extractor, note that EX_PERSON_COANSYS_ID extends EX_PERSON_ID
291306
new EXTRACT_CONTRIBDATA_GIVENDATA("-featureinfo Intersection#EX_PERSON_COANSYS_ID#1.0#1");
292307
}
293-
308+
294309
// Tools:
295310
private Tuple contribCreator(Object id, Object sname,
296311
Map<String,DataBag>features){

disambiguation/src/main/java/pl/edu/icm/coansys/disambiguation/features/Disambiguator.java

-8
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,4 @@ public SimpleEntry<Integer, Integer> intersectionAndSum(
8383
}
8484
return new SimpleEntry<Integer, Integer>(intersection, sum);
8585
}
86-
87-
/**
88-
*
89-
* @return {@link Disambiguator} id.
90-
*/
91-
public String getName() {
92-
return this.getClass().getSimpleName();
93-
}
9486
}

0 commit comments

Comments
 (0)