Commit 676f0351e15255260ff94b45c1573690893d5670
1 parent
624fd4fe
small fixes
Showing
3 changed files
with
3 additions
and
5 deletions
src/main/java/pl/waw/ipipan/zil/summ/emily/Main.java
... | ... | @@ -53,7 +53,7 @@ public class Main { |
53 | 53 | int targetWordCount = (int) (Utils.wordCount(body) / 100.0 * ratio); |
54 | 54 | |
55 | 55 | List<Unit> units = m.getUnitExtractor().extractUnits(text, body); |
56 | - Map<Unit, Double> weights = MainCommon.calculateWeights(m, body, text, units); | |
56 | + Map<Unit, Double> weights = MainCommon.calculateWeights(m, units); | |
57 | 57 | Set<Unit> chosenUnits = MainCommon.selectUnits(targetWordCount, units, weights); |
58 | 58 | LOG.info("Selected " + chosenUnits.size() + " units out of " + units.size() + "."); |
59 | 59 | |
... | ... |
src/main/java/pl/waw/ipipan/zil/summ/emily/MainCommon.java
... | ... | @@ -14,7 +14,6 @@ import java.util.stream.Collectors; |
14 | 14 | import org.apache.logging.log4j.LogManager; |
15 | 15 | import org.apache.logging.log4j.Logger; |
16 | 16 | |
17 | -import pl.waw.ipipan.zil.multiservice.thrift.types.TText; | |
18 | 17 | import pl.waw.ipipan.zil.summ.emily.model.FeatureExtractor; |
19 | 18 | import pl.waw.ipipan.zil.summ.emily.model.Model; |
20 | 19 | import pl.waw.ipipan.zil.summ.emily.model.unit.Unit; |
... | ... | @@ -57,8 +56,7 @@ public class MainCommon { |
57 | 56 | LOG.info("Saved output to file: " + outputFile); |
58 | 57 | } |
59 | 58 | |
60 | - public static Map<Unit, Double> calculateWeights(Model m, String body, TText text, List<Unit> units) | |
61 | - throws IOException, Exception { | |
59 | + public static Map<Unit, Double> calculateWeights(Model m, List<Unit> units) throws IOException, Exception { | |
62 | 60 | FeatureExtractor featureExtractor = m.getFeatureExtractor(); |
63 | 61 | featureExtractor.addTextUnits(units); |
64 | 62 | Instances instances = WekaUtils.createInstances(featureExtractor); |
... | ... |
src/main/java/pl/waw/ipipan/zil/summ/emily/MainThrifted.java
... | ... | @@ -57,7 +57,7 @@ public class MainThrifted { |
57 | 57 | String body = getTTextBody(text); |
58 | 58 | |
59 | 59 | List<Unit> units = m.getUnitExtractor().extractUnits(text, body); |
60 | - Map<Unit, Double> weights = MainCommon.calculateWeights(m, body, text, units); | |
60 | + Map<Unit, Double> weights = MainCommon.calculateWeights(m, units); | |
61 | 61 | |
62 | 62 | generateAndSaveSummaries(units, weights, targetDir, dir.getName(), Utils.wordCount(body), systemName); |
63 | 63 | |
... | ... |