From 042e57c774f40d6aa0b22fdaef942df895e5b6d3 Mon Sep 17 00:00:00 2001 From: mrj4001 Date: Sat, 11 May 2024 20:34:22 +0530 Subject: [PATCH 1/6] created new models for feedback score and modified ReciterArticle to support feedback score changes --- .../reciter/model/article/ReCiterArticle.java | 21 +++++++++++++++++++ .../model/article/ReciterFeedbackJournal.java | 19 +++++++++++++++++ .../model/article/ReciterFeedbackOrcid.java | 19 +++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 src/main/java/reciter/model/article/ReciterFeedbackJournal.java create mode 100644 src/main/java/reciter/model/article/ReciterFeedbackOrcid.java diff --git a/src/main/java/reciter/model/article/ReCiterArticle.java b/src/main/java/reciter/model/article/ReCiterArticle.java index 8680530..e18a8d6 100644 --- a/src/main/java/reciter/model/article/ReCiterArticle.java +++ b/src/main/java/reciter/model/article/ReCiterArticle.java @@ -989,4 +989,25 @@ public GenderEvidence getGenderEvidence() { public void setGenderEvidence(GenderEvidence genderEvidence) { this.genderEvidence = genderEvidence; } + //Feedback journal level scoring + private double feedbackScoreJournal; + //Feedback Orcid level scoring + private double feedbackScoreOrcid; + + public double getFeedbackScoreJournal() { + return feedbackScoreJournal; + } + + public void setFeedbackScoreJournal(double feedbackScoreJournal) { + this.feedbackScoreJournal = feedbackScoreJournal; + } + public void setFeedbackScoreOrcid(double feedbackScoreOrcid) + { + this.feedbackScoreOrcid = feedbackScoreOrcid; + } + public double getFeedbackScoreOrcid() + { + return feedbackScoreOrcid; + } + } diff --git a/src/main/java/reciter/model/article/ReciterFeedbackJournal.java b/src/main/java/reciter/model/article/ReciterFeedbackJournal.java new file mode 100644 index 0000000..7512f3c --- /dev/null +++ b/src/main/java/reciter/model/article/ReciterFeedbackJournal.java @@ -0,0 +1,19 @@ +package reciter.model.article; + +import lombok.Data; + +@Data +public class ReciterFeedbackJournal { + + private String personIdentifier; + private String journalTitle; + private int countAccepted; + private int countRejected; + private int countNull; + private double scoreAll; + private double scoreWithout1Accepted; + private double scoreWithout1Rejected; + private int goldStandard; + private long articleId; +} + \ No newline at end of file diff --git a/src/main/java/reciter/model/article/ReciterFeedbackOrcid.java b/src/main/java/reciter/model/article/ReciterFeedbackOrcid.java new file mode 100644 index 0000000..f9d20e1 --- /dev/null +++ b/src/main/java/reciter/model/article/ReciterFeedbackOrcid.java @@ -0,0 +1,19 @@ +package reciter.model.article; + +import lombok.Data; + +@Data +public class ReciterFeedbackOrcid { + + private String uid; + private long articleId; + private int countAccepted; + private int countRejected; + private int countNull; + private double scoreAll; + private double scoreWithout1Accepted; + private double scoreWithout1Rejected; + private int goldStandard; + private String orcid; + +} From c316af4138ac8f0afc1e985c3b9852cdea6707ec Mon Sep 17 00:00:00 2001 From: mrj4001 Date: Fri, 7 Jun 2024 14:45:11 +0530 Subject: [PATCH 2/6] Reciter article model changes for feedback score --- .../reciter/model/article/ReCiterArticle.java | 121 ++++++++++++++++++ .../article/ReCiterFeedbackScoreArticle.java | 17 +++ .../article/ReCiterFeedbackScoreCites.java | 18 +++ .../ReCiterFeedbackScoreCoAuthorName.java | 19 +++ .../article/ReCiterFeedbackScoreEmail.java | 21 +++ .../ReCiterFeedbackScoreInstitution.java | 18 +++ .../article/ReCiterFeedbackScoreJournal.java | 22 ++++ .../article/ReCiterFeedbackScoreKeyword.java | 18 +++ .../article/ReCiterFeedbackScoreOrcid.java | 19 +++ ...ReCiterFeedbackScoreOrcidCoAuthorName.java | 19 +++ .../ReCiterFeedbackScoreOrganization.java | 18 +++ .../ReCiterFeedbackScoreTargetAuthorName.java | 19 +++ .../article/ReCiterFeedbackScoreYear.java | 21 +++ 13 files changed, 350 insertions(+) create mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreArticle.java create mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreCites.java create mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreCoAuthorName.java create mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreEmail.java create mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreInstitution.java create mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreJournal.java create mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreKeyword.java create mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcid.java create mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcidCoAuthorName.java create mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreOrganization.java create mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreTargetAuthorName.java create mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreYear.java diff --git a/src/main/java/reciter/model/article/ReCiterArticle.java b/src/main/java/reciter/model/article/ReCiterArticle.java index e18a8d6..e8e2baf 100644 --- a/src/main/java/reciter/model/article/ReCiterArticle.java +++ b/src/main/java/reciter/model/article/ReCiterArticle.java @@ -993,6 +993,31 @@ public void setGenderEvidence(GenderEvidence genderEvidence) { private double feedbackScoreJournal; //Feedback Orcid level scoring private double feedbackScoreOrcid; + //Feedback Year level scoring + private double feedbackScoreYear; + //Feedback Email level scoring + private double feedbackScoreEmail; + //Feedback Journal Domain level scoring + private double feedbackScoreJournalDomain; + //Feedback Journal Field level scoring + private double feedbackScoreJournalField; + //Feedback Journal Sub Field level scoring + private double feedbackScoreJournalSubField; + //Feedback Keyword level scoring + private double feedbackScoreKeyword; + //Feedback TargetAuthorName level scoring + private double feedbackScoreTargetAuthorName; + //Feedback TargetAuthorName level scoring + private double feedbackScoreInstitution; + //Feedback TargetAuthorName level scoring + private double feedbackScoreOrganization; + //Feedback CoAuthorName level scoring + private double feedbackScoreCoAuthorName; + //Feedback OrcidCoAuthorName level scoring + private double feedbackScoreOrcidCoAuthor; + //Feedback OrcidCoAuthorName level scoring + private double feedbackScoreCitedPmid; + public double getFeedbackScoreJournal() { return feedbackScoreJournal; @@ -1009,5 +1034,101 @@ public double getFeedbackScoreOrcid() { return feedbackScoreOrcid; } + + public double getFeedbackScoreYear() { + return feedbackScoreYear; + } + + public void setFeedbackScoreYear(double feedbackScoreYear) { + this.feedbackScoreYear = feedbackScoreYear; + } + + public double getFeedbackScoreEmail() { + return feedbackScoreEmail; + } + + public void setFeedbackScoreEmail(double feedbackScoreEmail) { + this.feedbackScoreEmail = feedbackScoreEmail; + } + + public double getFeedbackScoreJournalDomain() { + return feedbackScoreJournalDomain; + } + + public void setFeedbackScoreJournalDomain(double feedbackScoreJournalDomain) { + this.feedbackScoreJournalDomain = feedbackScoreJournalDomain; + } + + public double getFeedbackScoreJournalField() { + return feedbackScoreJournalField; + } + + public void setFeedbackScoreJournalField(double feedbackScoreJournalField) { + this.feedbackScoreJournalField = feedbackScoreJournalField; + } + + public double getFeedbackScoreJournalSubField() { + return feedbackScoreJournalSubField; + } + + public void setFeedbackScoreJournalSubField(double feedbackScoreJournalSubField) { + this.feedbackScoreJournalSubField = feedbackScoreJournalSubField; + } + + public double getFeedbackScoreKeyword() { + return feedbackScoreKeyword; + } + + public void setFeedbackScoreKeyword(double feedbackScoreKeyword) { + this.feedbackScoreKeyword = feedbackScoreKeyword; + } + + public double getFeedbackScoreTargetAuthorName() { + return feedbackScoreTargetAuthorName; + } + + public void setFeedbackScoreTargetAuthorName(double feedbackScoreTargetAuthorName) { + this.feedbackScoreTargetAuthorName = feedbackScoreTargetAuthorName; + } + + public double getFeedbackScoreInstitution() { + return feedbackScoreInstitution; + } + + public void setFeedbackScoreInstitution(double feedbackScoreInstitution) { + this.feedbackScoreInstitution = feedbackScoreInstitution; + } + + public double getFeedbackScoreOrganization() { + return feedbackScoreOrganization; + } + + public void setFeedbackScoreOrganization(double feedbackScoreOrganization) { + this.feedbackScoreOrganization = feedbackScoreOrganization; + } + + public double getFeedbackScoreCoAuthorName() { + return feedbackScoreCoAuthorName; + } + + public void setFeedbackScoreCoAuthorName(double feedbackScoreCoAuthorName) { + this.feedbackScoreCoAuthorName = feedbackScoreCoAuthorName; + } + + public double getFeedbackScoreOrcidCoAuthor() { + return feedbackScoreOrcidCoAuthor; + } + + public void setFeedbackScoreOrcidCoAuthor(double feedbackScoreOrcidCoAuthor) { + this.feedbackScoreOrcidCoAuthor = feedbackScoreOrcidCoAuthor; + } + + public double getFeedbackScoreCitedPmid() { + return feedbackScoreCitedPmid; + } + + public void setFeedbackScoreCitedPmid(double feedbackScoreCitedPmid) { + this.feedbackScoreCitedPmid = feedbackScoreCitedPmid; + } } diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreArticle.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreArticle.java new file mode 100644 index 0000000..d011cea --- /dev/null +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreArticle.java @@ -0,0 +1,17 @@ +package reciter.model.article; + +import lombok.Data; + +@Data +public class ReCiterFeedbackScoreArticle { + + private String personIdentifier; + private int countAccepted; + private int countRejected; + private int countNull; + private double scoreAll; + private double scoreWithout1Accepted; + private double scoreWithout1Rejected; + private int goldStandard; + private long articleId; +} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreCites.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreCites.java new file mode 100644 index 0000000..40f5c09 --- /dev/null +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreCites.java @@ -0,0 +1,18 @@ +package reciter.model.article; + +import lombok.Data; + +@Data +public class ReCiterFeedbackScoreCites { + + private String uid; + private long articleId; + private int countAccepted; + private int countRejected; + private int countNull; + private double scoreAll; + private double scoreWithout1Accepted; + private double scoreWithout1Rejected; + private int goldStandard; + private long citedPmid; +} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreCoAuthorName.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreCoAuthorName.java new file mode 100644 index 0000000..d152782 --- /dev/null +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreCoAuthorName.java @@ -0,0 +1,19 @@ +package reciter.model.article; + +import lombok.Data; + +@Data +public class ReCiterFeedbackScoreCoAuthorName { + + private String uid; + private long articleId; + private int countAccepted; + private int countRejected; + private int countNull; + private double scoreAll; + private double scoreWithout1Accepted; + private double scoreWithout1Rejected; + private int goldStandard; + private String coAuthorName; + +} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreEmail.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreEmail.java new file mode 100644 index 0000000..9adfcfa --- /dev/null +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreEmail.java @@ -0,0 +1,21 @@ +package reciter.model.article; + +import java.util.Date; + +import lombok.Data; + +@Data +public class ReCiterFeedbackScoreEmail { + + private String personIdentifier; + private long articleId; + private int countAccepted; + private int countRejected; + private int countNull; + private double scoreAll; + private double scoreWithout1Accepted; + private double scoreWithout1Rejected; + private int goldStandard; + private String email; + +} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreInstitution.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreInstitution.java new file mode 100644 index 0000000..e2e7435 --- /dev/null +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreInstitution.java @@ -0,0 +1,18 @@ +package reciter.model.article; + +import lombok.Data; + +@Data +public class ReCiterFeedbackScoreInstitution { + + private String personIdentifier; + private int countAccepted; + private int countRejected; + private int countNull; + private double scoreAll; + private double scoreWithout1Accepted; + private double scoreWithout1Rejected; + private int goldStandard; + private long articleId; + private String institution; +} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreJournal.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreJournal.java new file mode 100644 index 0000000..1690158 --- /dev/null +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreJournal.java @@ -0,0 +1,22 @@ +package reciter.model.article; + +import lombok.Data; + +@Data +public class ReCiterFeedbackScoreJournal { + + private String personIdentifier; + private int countAccepted; + private int countRejected; + private int countNull; + private double scoreAll; + private double scoreWithout1Accepted; + private double scoreWithout1Rejected; + private int goldStandard; + private long articleId; + private String journalTitle; + private String journalDomain; + private String journalField; + private String journalSubField; +} + \ No newline at end of file diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreKeyword.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreKeyword.java new file mode 100644 index 0000000..970cfe6 --- /dev/null +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreKeyword.java @@ -0,0 +1,18 @@ +package reciter.model.article; + +import lombok.Data; + +@Data +public class ReCiterFeedbackScoreKeyword { + + private String uid; + private long articleId; + private int countAccepted; + private int countRejected; + private int countNull; + private double scoreAll; + private double scoreWithout1Accepted; + private double scoreWithout1Rejected; + private int goldStandard; + private String keyword; +} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcid.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcid.java new file mode 100644 index 0000000..9eb2eda --- /dev/null +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcid.java @@ -0,0 +1,19 @@ +package reciter.model.article; + +import lombok.Data; + +@Data +public class ReCiterFeedbackScoreOrcid { + + private String uid; + private long articleId; + private int countAccepted; + private int countRejected; + private int countNull; + private double scoreAll; + private double scoreWithout1Accepted; + private double scoreWithout1Rejected; + private int goldStandard; + private String orcid; + +} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcidCoAuthorName.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcidCoAuthorName.java new file mode 100644 index 0000000..a13e7cd --- /dev/null +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcidCoAuthorName.java @@ -0,0 +1,19 @@ +package reciter.model.article; + +import lombok.Data; + +@Data +public class ReCiterFeedbackScoreOrcidCoAuthorName { + + private String uid; + private long articleId; + private int countAccepted; + private int countRejected; + private int countNull; + private double scoreAll; + private double scoreWithout1Accepted; + private double scoreWithout1Rejected; + private int goldStandard; + private String coAuthorOrcid; + +} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrganization.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrganization.java new file mode 100644 index 0000000..673432a --- /dev/null +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrganization.java @@ -0,0 +1,18 @@ +package reciter.model.article; + +import lombok.Data; +@Data +public class ReCiterFeedbackScoreOrganization { + + private String personIdentifier; + private int countAccepted; + private int countRejected; + private int countNull; + private double scoreAll; + private double scoreWithout1Accepted; + private double scoreWithout1Rejected; + private int goldStandard; + private long articleId; + private String organization; + +} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreTargetAuthorName.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreTargetAuthorName.java new file mode 100644 index 0000000..358cab1 --- /dev/null +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreTargetAuthorName.java @@ -0,0 +1,19 @@ +package reciter.model.article; + +import lombok.Data; + +@Data +public class ReCiterFeedbackScoreTargetAuthorName { + + private String uid; + private long articleId; + private int countAccepted; + private int countRejected; + private int countNull; + private double scoreAll; + private double scoreWithout1Accepted; + private double scoreWithout1Rejected; + private int goldStandard; + private String articleTargetAuthorName; + +} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreYear.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreYear.java new file mode 100644 index 0000000..f5b0d3f --- /dev/null +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreYear.java @@ -0,0 +1,21 @@ +package reciter.model.article; + +import java.util.Date; + +import lombok.Data; + +@Data +public class ReCiterFeedbackScoreYear { + + private String personIdentifier; + private long articleId; + private int countAccepted; + private int countRejected; + private int countNull; + private double scoreAll; + private double scoreWithout1Accepted; + private double scoreWithout1Rejected; + private int goldStandard; + private long articleYear; + +} From a2cf023f0983dc3fb70c3ce4e7888da1547d6ba3 Mon Sep 17 00:00:00 2001 From: mrj4001 Date: Fri, 6 Sep 2024 23:03:55 +0530 Subject: [PATCH 3/6] reciterFeedbackScoring-dev-inprogress --- .../reciter/model/article/ReCiterArticle.java | 304 ++++++++++++------ .../article/ReCiterFeedbackScoreArticle.java | 84 ++++- .../article/ReCiterFeedbackScoreCites.java | 12 +- .../ReCiterFeedbackScoreCoAuthorName.java | 10 +- .../article/ReCiterFeedbackScoreEmail.java | 12 +- .../ReCiterFeedbackScoreInstitution.java | 12 +- .../article/ReCiterFeedbackScoreJournal.java | 15 +- .../article/ReCiterFeedbackScoreKeyword.java | 13 +- .../article/ReCiterFeedbackScoreOrcid.java | 13 +- ...ReCiterFeedbackScoreOrcidCoAuthorName.java | 15 +- .../ReCiterFeedbackScoreOrganization.java | 12 +- .../ReCiterFeedbackScoreTargetAuthorName.java | 12 +- .../article/ReCiterFeedbackScoreYear.java | 14 +- 13 files changed, 320 insertions(+), 208 deletions(-) diff --git a/src/main/java/reciter/model/article/ReCiterArticle.java b/src/main/java/reciter/model/article/ReCiterArticle.java index e8e2baf..dc4aad0 100644 --- a/src/main/java/reciter/model/article/ReCiterArticle.java +++ b/src/main/java/reciter/model/article/ReCiterArticle.java @@ -19,8 +19,10 @@ package reciter.model.article; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import com.fasterxml.jackson.annotation.JsonCreator; @@ -89,7 +91,41 @@ public class ReCiterArticle implements Comparable { */ @Transient private ScopusArticle scopusArticle; - + + @Transient + private ReCiterFeedbackScoreArticle feedbackScoreArticle; + + //Feedback final scores + private double coAuthorNameFeedbackScore; + private double keywordFeedackScore; + private double journalFeedackScore; + private double journalDomainFeedbackScore; + private double journalFieldFeedbackScore; + private double journalSubFieldFeedbackScore; + private double orcidFeedbackScore; + private double orcidCoAuthorFeedbackScore; + private double citesFeedbackScore; + private double emailFeedbackScore; + private double institutionFeedbackScore; + private double organizationFeedbackScore; + private double targetAuthorNameFeedbackScore; + private double yearFeedbackScore; + private String exportedCoAuthorNameFeedbackScore; + private String exportedKeywordFeedackScore; + private String exportedJournalFeedackScore; + private String exportedJournalDomainFeedbackScore; + private String exportedJournalFieldFeedbackScore; + private String exportedJournalSubFieldFeedbackScore; + private String exportedOrcidFeedbackScore; + private String exportedOrcidCoAuthorFeedbackScore; + private String exportedCitesFeedbackScore; + private String exportedEmailFeedbackScore; + private String exportedInstitutionFeedbackScore; + private String exportedOrganizationFeedbackScore; + private String exportedTargetAuthorNameFeedbackScore; + private String exportedYearFeedbackScore; + + /** * Grant List. @@ -989,146 +1025,234 @@ public GenderEvidence getGenderEvidence() { public void setGenderEvidence(GenderEvidence genderEvidence) { this.genderEvidence = genderEvidence; } - //Feedback journal level scoring - private double feedbackScoreJournal; - //Feedback Orcid level scoring - private double feedbackScoreOrcid; - //Feedback Year level scoring - private double feedbackScoreYear; - //Feedback Email level scoring - private double feedbackScoreEmail; - //Feedback Journal Domain level scoring - private double feedbackScoreJournalDomain; - //Feedback Journal Field level scoring - private double feedbackScoreJournalField; - //Feedback Journal Sub Field level scoring - private double feedbackScoreJournalSubField; - //Feedback Keyword level scoring - private double feedbackScoreKeyword; - //Feedback TargetAuthorName level scoring - private double feedbackScoreTargetAuthorName; - //Feedback TargetAuthorName level scoring - private double feedbackScoreInstitution; - //Feedback TargetAuthorName level scoring - private double feedbackScoreOrganization; - //Feedback CoAuthorName level scoring - private double feedbackScoreCoAuthorName; - //Feedback OrcidCoAuthorName level scoring - private double feedbackScoreOrcidCoAuthor; - //Feedback OrcidCoAuthorName level scoring - private double feedbackScoreCitedPmid; - - - public double getFeedbackScoreJournal() { - return feedbackScoreJournal; + public ReCiterFeedbackScoreArticle getFeedbackScoreArticle() { + return feedbackScoreArticle; + } + + public void setFeedbackScoreArticle(ReCiterFeedbackScoreArticle feedbackScoreArticle) { + this.feedbackScoreArticle = feedbackScoreArticle; + } + public double getCoAuthorNameFeedbackScore() { + return coAuthorNameFeedbackScore; + } + + public void setCoAuthorNameFeedbackScore(double coAuthorNameFeedbackScore) { + this.coAuthorNameFeedbackScore = coAuthorNameFeedbackScore; + } + + public double getKeywordFeedackScore() { + return keywordFeedackScore; + } + + public void setKeywordFeedackScore(double keywordFeedackScore) { + this.keywordFeedackScore = keywordFeedackScore; + } + + public double getJournalDomainFeedbackScore() { + return journalDomainFeedbackScore; + } + + public void setJournalDomainFeedbackScore(double journalDomainFeedbackScore) { + this.journalDomainFeedbackScore = journalDomainFeedbackScore; } - public void setFeedbackScoreJournal(double feedbackScoreJournal) { - this.feedbackScoreJournal = feedbackScoreJournal; + public double getJournalFieldFeedbackScore() { + return journalFieldFeedbackScore; } - public void setFeedbackScoreOrcid(double feedbackScoreOrcid) - { - this.feedbackScoreOrcid = feedbackScoreOrcid; + + public void setJournalFieldFeedbackScore(double journalFieldFeedbackScore) { + this.journalFieldFeedbackScore = journalFieldFeedbackScore; + } + + public double getJournalSubFieldFeedbackScore() { + return journalSubFieldFeedbackScore; + } + + public void setJournalSubFieldFeedbackScore(double journalSubFieldFeedbackScore) { + this.journalSubFieldFeedbackScore = journalSubFieldFeedbackScore; + } + + public double getOrcidFeedbackScore() { + return orcidFeedbackScore; + } + + public void setOrcidFeedbackScore(double orcidFeedbackScore) { + this.orcidFeedbackScore = orcidFeedbackScore; + } + + public double getOrcidCoAuthorFeedbackScore() { + return orcidCoAuthorFeedbackScore; + } + + public void setOrcidCoAuthorFeedbackScore(double orcidCoAuthorFeedbackScore) { + this.orcidCoAuthorFeedbackScore = orcidCoAuthorFeedbackScore; + } + + public double getCitesFeedbackScore() { + return citesFeedbackScore; } - public double getFeedbackScoreOrcid() - { - return feedbackScoreOrcid; + + public void setCitesFeedbackScore(double citesFeedbackScore) { + this.citesFeedbackScore = citesFeedbackScore; + } + + public double getEmailFeedbackScore() { + return emailFeedbackScore; + } + + public void setEmailFeedbackScore(double emailFeedbackScore) { + this.emailFeedbackScore = emailFeedbackScore; + } + + public double getInstitutionFeedbackScore() { + return institutionFeedbackScore; + } + + public void setInstitutionFeedbackScore(double institutionFeedbackScore) { + this.institutionFeedbackScore = institutionFeedbackScore; + } + + public double getOrganizationFeedbackScore() { + return organizationFeedbackScore; + } + + public void setOrganizationFeedbackScore(double organizationFeedbackScore) { + this.organizationFeedbackScore = organizationFeedbackScore; + } + + public double getTargetAuthorNameFeedbackScore() { + return targetAuthorNameFeedbackScore; + } + + public void setTargetAuthorNameFeedbackScore(double targetAuthorNameFeedbackScore) { + this.targetAuthorNameFeedbackScore = targetAuthorNameFeedbackScore; + } + + public double getYearFeedbackScore() { + return yearFeedbackScore; + } + + public void setYearFeedbackScore(double yearFeedbackScore) { + this.yearFeedbackScore = yearFeedbackScore; + } + + public double getJournalFeedackScore() { + return journalFeedackScore; + } + + public void setJournalFeedackScore(double journalFeedackScore) { + this.journalFeedackScore = journalFeedackScore; + } + + public String getExportedCoAuthorNameFeedbackScore() { + return exportedCoAuthorNameFeedbackScore; + } + + public void setExportedCoAuthorNameFeedbackScore(String exportedCoAuthorNameFeedbackScore) { + this.exportedCoAuthorNameFeedbackScore = exportedCoAuthorNameFeedbackScore; + } + + public String getExportedKeywordFeedackScore() { + return exportedKeywordFeedackScore; + } + + public void setExportedKeywordFeedackScore(String exportedKeywordFeedackScore) { + this.exportedKeywordFeedackScore = exportedKeywordFeedackScore; } - public double getFeedbackScoreYear() { - return feedbackScoreYear; + public String getExportedJournalFeedackScore() { + return exportedJournalFeedackScore; } - public void setFeedbackScoreYear(double feedbackScoreYear) { - this.feedbackScoreYear = feedbackScoreYear; + public void setExportedJournalFeedackScore(String exportedJournalFeedackScore) { + this.exportedJournalFeedackScore = exportedJournalFeedackScore; } - public double getFeedbackScoreEmail() { - return feedbackScoreEmail; + public String getExportedJournalDomainFeedbackScore() { + return exportedJournalDomainFeedbackScore; } - public void setFeedbackScoreEmail(double feedbackScoreEmail) { - this.feedbackScoreEmail = feedbackScoreEmail; + public void setExportedJournalDomainFeedbackScore(String exportedJournalDomainFeedbackScore) { + this.exportedJournalDomainFeedbackScore = exportedJournalDomainFeedbackScore; } - public double getFeedbackScoreJournalDomain() { - return feedbackScoreJournalDomain; + public String getExportedJournalFieldFeedbackScore() { + return exportedJournalFieldFeedbackScore; } - public void setFeedbackScoreJournalDomain(double feedbackScoreJournalDomain) { - this.feedbackScoreJournalDomain = feedbackScoreJournalDomain; + public void setExportedJournalFieldFeedbackScore(String exportedJournalFieldFeedbackScore) { + this.exportedJournalFieldFeedbackScore = exportedJournalFieldFeedbackScore; } - public double getFeedbackScoreJournalField() { - return feedbackScoreJournalField; + public String getExportedJournalSubFieldFeedbackScore() { + return exportedJournalSubFieldFeedbackScore; } - public void setFeedbackScoreJournalField(double feedbackScoreJournalField) { - this.feedbackScoreJournalField = feedbackScoreJournalField; + public void setExportedJournalSubFieldFeedbackScore(String exportedJournalSubFieldFeedbackScore) { + this.exportedJournalSubFieldFeedbackScore = exportedJournalSubFieldFeedbackScore; } - public double getFeedbackScoreJournalSubField() { - return feedbackScoreJournalSubField; + public String getExportedOrcidFeedbackScore() { + return exportedOrcidFeedbackScore; } - public void setFeedbackScoreJournalSubField(double feedbackScoreJournalSubField) { - this.feedbackScoreJournalSubField = feedbackScoreJournalSubField; + public void setExportedOrcidFeedbackScore(String exportedOrcidFeedbackScore) { + this.exportedOrcidFeedbackScore = exportedOrcidFeedbackScore; } - public double getFeedbackScoreKeyword() { - return feedbackScoreKeyword; + public String getExportedOrcidCoAuthorFeedbackScore() { + return exportedOrcidCoAuthorFeedbackScore; } - public void setFeedbackScoreKeyword(double feedbackScoreKeyword) { - this.feedbackScoreKeyword = feedbackScoreKeyword; + public void setExportedOrcidCoAuthorFeedbackScore(String exportedOrcidCoAuthorFeedbackScore) { + this.exportedOrcidCoAuthorFeedbackScore = exportedOrcidCoAuthorFeedbackScore; } - public double getFeedbackScoreTargetAuthorName() { - return feedbackScoreTargetAuthorName; + public String getExportedCitesFeedbackScore() { + return exportedCitesFeedbackScore; } - public void setFeedbackScoreTargetAuthorName(double feedbackScoreTargetAuthorName) { - this.feedbackScoreTargetAuthorName = feedbackScoreTargetAuthorName; + public void setExportedCitesFeedbackScore(String exportedCitesFeedbackScore) { + this.exportedCitesFeedbackScore = exportedCitesFeedbackScore; } - public double getFeedbackScoreInstitution() { - return feedbackScoreInstitution; + public String getExportedEmailFeedbackScore() { + return exportedEmailFeedbackScore; } - public void setFeedbackScoreInstitution(double feedbackScoreInstitution) { - this.feedbackScoreInstitution = feedbackScoreInstitution; + public void setExportedEmailFeedbackScore(String exportedEmailFeedbackScore) { + this.exportedEmailFeedbackScore = exportedEmailFeedbackScore; } - public double getFeedbackScoreOrganization() { - return feedbackScoreOrganization; + public String getExportedInstitutionFeedbackScore() { + return exportedInstitutionFeedbackScore; } - public void setFeedbackScoreOrganization(double feedbackScoreOrganization) { - this.feedbackScoreOrganization = feedbackScoreOrganization; + public void setExportedInstitutionFeedbackScore(String exportedInstitutionFeedbackScore) { + this.exportedInstitutionFeedbackScore = exportedInstitutionFeedbackScore; } - public double getFeedbackScoreCoAuthorName() { - return feedbackScoreCoAuthorName; + public String getExportedOrganizationFeedbackScore() { + return exportedOrganizationFeedbackScore; } - public void setFeedbackScoreCoAuthorName(double feedbackScoreCoAuthorName) { - this.feedbackScoreCoAuthorName = feedbackScoreCoAuthorName; + public void setExportedOrganizationFeedbackScore(String exportedOrganizationFeedbackScore) { + this.exportedOrganizationFeedbackScore = exportedOrganizationFeedbackScore; } - public double getFeedbackScoreOrcidCoAuthor() { - return feedbackScoreOrcidCoAuthor; + public String getExportedTargetAuthorNameFeedbackScore() { + return exportedTargetAuthorNameFeedbackScore; } - public void setFeedbackScoreOrcidCoAuthor(double feedbackScoreOrcidCoAuthor) { - this.feedbackScoreOrcidCoAuthor = feedbackScoreOrcidCoAuthor; + public void setExportedTargetAuthorNameFeedbackScore(String exportedTargetAuthorNameFeedbackScore) { + this.exportedTargetAuthorNameFeedbackScore = exportedTargetAuthorNameFeedbackScore; } - public double getFeedbackScoreCitedPmid() { - return feedbackScoreCitedPmid; + public String getExportedYearFeedbackScore() { + return exportedYearFeedbackScore; } - public void setFeedbackScoreCitedPmid(double feedbackScoreCitedPmid) { - this.feedbackScoreCitedPmid = feedbackScoreCitedPmid; + public void setExportedYearFeedbackScore(String exportedYearFeedbackScore) { + this.exportedYearFeedbackScore = exportedYearFeedbackScore; } - } diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreArticle.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreArticle.java index d011cea..665d61e 100644 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreArticle.java +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreArticle.java @@ -1,17 +1,91 @@ package reciter.model.article; +import java.util.ArrayList; +import java.util.List; + import lombok.Data; @Data public class ReCiterFeedbackScoreArticle { - private String personIdentifier; - private int countAccepted; - private int countRejected; + //private String personIdentifier; + private int acceptedCount; + private int rejectedCount; private int countNull; private double scoreAll; + private long citedPmid; + private List coAuthorNameList; + private String email; + private String institution; + private String journalTitle; + private String journalDomain; + private String journalField; + private String journalSubField; + private String keyword; + private String orcid; + private String coAuthorOrcid; + private double sumAccepted; + private double sumRejected; + private String organization; + private long articleYear; + + + + //Feedback countAccepted scoring + private double countAccepted; + //Feedback countRejected scoring + private double countRejected; + //Feedback countScoreAll scoring + private double countScoreAll; + //Feedback scoreWithout1Accepted scoring private double scoreWithout1Accepted; + //Feedback ScoreWithout1Rejected scoring private double scoreWithout1Rejected; - private int goldStandard; - private long articleId; + + //Feedback journal level scoring + private double feedbackScoreJournal; + //Feedback Orcid level scoring + private double feedbackScoreOrcid; + //Feedback Year level scoring + private double feedbackScoreYear; + //Feedback Email level scoring + private double feedbackScoreEmail; + //Feedback Journal Domain level scoring + private double feedbackScoreJournalDomain; + //Feedback Journal Field level scoring + private double feedbackScoreJournalField; + //Feedback Journal Sub Field level scoring + private double feedbackScoreJournalSubField; + //Feedback Keyword level scoring + private double feedbackScoreKeyword; + //Feedback TargetAuthorName level scoring + private double feedbackScoreTargetAuthorName; + //Feedback TargetAuthorName level scoring + private double feedbackScoreInstitution; + //Feedback TargetAuthorName level scoring + private double feedbackScoreOrganization; + //Feedback CoAuthorName level scoring + private double feedbackScoreCoAuthorName; + //Feedback OrcidCoAuthorName level scoring + private double feedbackScoreOrcidCoAuthor; + //Feedback OrcidCoAuthorName level scoring + private double feedbackScoreCitedPmid; + //Feedback feedbackScoreCoAuthorOrcid level scoring + private double feedbackScoreCoAuthorOrcid; + //Feedback feedbackScoreCites level scoring + private double feedbackScoreCites; + //Feedback articleTargetAuthorName scoring + private String articleTargetAuthorName; + + public ReCiterFeedbackScoreArticle() + { + coAuthorNameList = new ArrayList<>(); + } + + // Setter method for count that prevents direct setting + public void addToCoAuthorNameList(String coAuthorName) { + this.coAuthorNameList.add(coAuthorName); + } + + } diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreCites.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreCites.java index 40f5c09..501b8db 100644 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreCites.java +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreCites.java @@ -3,16 +3,8 @@ import lombok.Data; @Data -public class ReCiterFeedbackScoreCites { +public class ReCiterFeedbackScoreCites{ - private String uid; - private long articleId; - private int countAccepted; - private int countRejected; - private int countNull; - private double scoreAll; - private double scoreWithout1Accepted; - private double scoreWithout1Rejected; - private int goldStandard; private long citedPmid; + private double feedbackScoreCites; } diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreCoAuthorName.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreCoAuthorName.java index d152782..fe9b539 100644 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreCoAuthorName.java +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreCoAuthorName.java @@ -5,15 +5,7 @@ @Data public class ReCiterFeedbackScoreCoAuthorName { - private String uid; - private long articleId; - private int countAccepted; - private int countRejected; - private int countNull; - private double scoreAll; - private double scoreWithout1Accepted; - private double scoreWithout1Rejected; - private int goldStandard; private String coAuthorName; + private double feedbackScoreCoAuthorName; } diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreEmail.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreEmail.java index 9adfcfa..fa2fe0a 100644 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreEmail.java +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreEmail.java @@ -5,17 +5,9 @@ import lombok.Data; @Data -public class ReCiterFeedbackScoreEmail { +public class ReCiterFeedbackScoreEmail /* extends ReCiterFeedbackScoreArticle*/ { - private String personIdentifier; - private long articleId; - private int countAccepted; - private int countRejected; - private int countNull; - private double scoreAll; - private double scoreWithout1Accepted; - private double scoreWithout1Rejected; - private int goldStandard; private String email; + private double feedbackScoreEmail; } diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreInstitution.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreInstitution.java index e2e7435..6c828e4 100644 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreInstitution.java +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreInstitution.java @@ -3,16 +3,8 @@ import lombok.Data; @Data -public class ReCiterFeedbackScoreInstitution { +public class ReCiterFeedbackScoreInstitution /*extends ReCiterFeedbackScoreArticle*/ { - private String personIdentifier; - private int countAccepted; - private int countRejected; - private int countNull; - private double scoreAll; - private double scoreWithout1Accepted; - private double scoreWithout1Rejected; - private int goldStandard; - private long articleId; private String institution; + private double feedbackScoreInstitution; } diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreJournal.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreJournal.java index 1690158..21c97e2 100644 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreJournal.java +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreJournal.java @@ -3,20 +3,15 @@ import lombok.Data; @Data -public class ReCiterFeedbackScoreJournal { +public class ReCiterFeedbackScoreJournal /*extends ReCiterFeedbackScoreArticle*/{ - private String personIdentifier; - private int countAccepted; - private int countRejected; - private int countNull; - private double scoreAll; - private double scoreWithout1Accepted; - private double scoreWithout1Rejected; - private int goldStandard; - private long articleId; private String journalTitle; private String journalDomain; private String journalField; private String journalSubField; + private double feedbackScoreJournal; + private double feedbackScoreJournalDomain; + private double feedbackScoreJournalField; + private double feedbackScoreJournalSubField; } \ No newline at end of file diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreKeyword.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreKeyword.java index 970cfe6..bfc2cbd 100644 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreKeyword.java +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreKeyword.java @@ -2,17 +2,10 @@ import lombok.Data; + @Data -public class ReCiterFeedbackScoreKeyword { +public class ReCiterFeedbackScoreKeyword /*extends ReCiterFeedbackScoreArticle*/{ - private String uid; - private long articleId; - private int countAccepted; - private int countRejected; - private int countNull; - private double scoreAll; - private double scoreWithout1Accepted; - private double scoreWithout1Rejected; - private int goldStandard; private String keyword; + private double feedbackScoreKeyword; } diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcid.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcid.java index 9eb2eda..d7c0a61 100644 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcid.java +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcid.java @@ -3,17 +3,8 @@ import lombok.Data; @Data -public class ReCiterFeedbackScoreOrcid { +public class ReCiterFeedbackScoreOrcid /*extends ReCiterFeedbackScoreArticle*/{ - private String uid; - private long articleId; - private int countAccepted; - private int countRejected; - private int countNull; - private double scoreAll; - private double scoreWithout1Accepted; - private double scoreWithout1Rejected; - private int goldStandard; private String orcid; - + private double feedbackScoreOrcid; } diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcidCoAuthorName.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcidCoAuthorName.java index a13e7cd..dcba976 100644 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcidCoAuthorName.java +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcidCoAuthorName.java @@ -3,17 +3,10 @@ import lombok.Data; @Data -public class ReCiterFeedbackScoreOrcidCoAuthorName { +public class ReCiterFeedbackScoreOrcidCoAuthorName /*extends ReCiterFeedbackScoreArticle*/{ - private String uid; - private long articleId; - private int countAccepted; - private int countRejected; - private int countNull; - private double scoreAll; - private double scoreWithout1Accepted; - private double scoreWithout1Rejected; - private int goldStandard; private String coAuthorOrcid; - + private double feedbackScoreCoAuthorOrcid; + private double sumAccepted; + private double sumRejected; } diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrganization.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrganization.java index 673432a..b11e33c 100644 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrganization.java +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrganization.java @@ -2,17 +2,9 @@ import lombok.Data; @Data -public class ReCiterFeedbackScoreOrganization { +public class ReCiterFeedbackScoreOrganization /*extends ReCiterFeedbackScoreArticle*/{ - private String personIdentifier; - private int countAccepted; - private int countRejected; - private int countNull; - private double scoreAll; - private double scoreWithout1Accepted; - private double scoreWithout1Rejected; - private int goldStandard; - private long articleId; private String organization; + private double feedbackScoreOrganization; } diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreTargetAuthorName.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreTargetAuthorName.java index 358cab1..28e937c 100644 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreTargetAuthorName.java +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreTargetAuthorName.java @@ -3,17 +3,9 @@ import lombok.Data; @Data -public class ReCiterFeedbackScoreTargetAuthorName { +public class ReCiterFeedbackScoreTargetAuthorName /*extends ReCiterFeedbackScoreArticle*/{ - private String uid; - private long articleId; - private int countAccepted; - private int countRejected; - private int countNull; - private double scoreAll; - private double scoreWithout1Accepted; - private double scoreWithout1Rejected; - private int goldStandard; private String articleTargetAuthorName; + private double feedbackScoreTargetAuthorName; } diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreYear.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreYear.java index f5b0d3f..2808e73 100644 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreYear.java +++ b/src/main/java/reciter/model/article/ReCiterFeedbackScoreYear.java @@ -1,21 +1,11 @@ package reciter.model.article; -import java.util.Date; - import lombok.Data; @Data -public class ReCiterFeedbackScoreYear { +public class ReCiterFeedbackScoreYear /*extends ReCiterFeedbackScoreArticle*/{ - private String personIdentifier; - private long articleId; - private int countAccepted; - private int countRejected; - private int countNull; - private double scoreAll; - private double scoreWithout1Accepted; - private double scoreWithout1Rejected; - private int goldStandard; private long articleYear; + private double feedbackScoreYear; } From aadc49695fe3dc7bbfeeb83f5847781de9ec5adb Mon Sep 17 00:00:00 2001 From: mrj4001 Date: Fri, 6 Sep 2024 23:04:52 +0530 Subject: [PATCH 4/6] Added new file for ReciterFeedbackScore --- .../article/ReCiterArticleFeedbackScore.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/main/java/reciter/model/article/ReCiterArticleFeedbackScore.java diff --git a/src/main/java/reciter/model/article/ReCiterArticleFeedbackScore.java b/src/main/java/reciter/model/article/ReCiterArticleFeedbackScore.java new file mode 100644 index 0000000..818e836 --- /dev/null +++ b/src/main/java/reciter/model/article/ReCiterArticleFeedbackScore.java @@ -0,0 +1,22 @@ +package reciter.model.article; + +import java.math.BigDecimal; + +import lombok.Data; + +@Data +public class ReCiterArticleFeedbackScore { + + private int acceptedCount; + private int rejectedCount; + private int countNull; + private double scoreAll; + private double scoreWithout1Accepted; + private double scoreWithout1Rejected; + private long articleId; + private String feedbackScoreFieldValue; + private double feedbackScore; + private int goldStandard; + private String exportedFeedbackScore; +} + From 7a071f4469a0a37b9ecb8d8f64553b522db1a997 Mon Sep 17 00:00:00 2001 From: mrj4001 Date: Fri, 6 Sep 2024 23:29:37 +0530 Subject: [PATCH 5/6] deleted files --- .../model/article/ReciterFeedbackJournal.java | 19 ------------------- .../model/article/ReciterFeedbackOrcid.java | 19 ------------------- 2 files changed, 38 deletions(-) delete mode 100644 src/main/java/reciter/model/article/ReciterFeedbackJournal.java delete mode 100644 src/main/java/reciter/model/article/ReciterFeedbackOrcid.java diff --git a/src/main/java/reciter/model/article/ReciterFeedbackJournal.java b/src/main/java/reciter/model/article/ReciterFeedbackJournal.java deleted file mode 100644 index 7512f3c..0000000 --- a/src/main/java/reciter/model/article/ReciterFeedbackJournal.java +++ /dev/null @@ -1,19 +0,0 @@ -package reciter.model.article; - -import lombok.Data; - -@Data -public class ReciterFeedbackJournal { - - private String personIdentifier; - private String journalTitle; - private int countAccepted; - private int countRejected; - private int countNull; - private double scoreAll; - private double scoreWithout1Accepted; - private double scoreWithout1Rejected; - private int goldStandard; - private long articleId; -} - \ No newline at end of file diff --git a/src/main/java/reciter/model/article/ReciterFeedbackOrcid.java b/src/main/java/reciter/model/article/ReciterFeedbackOrcid.java deleted file mode 100644 index f9d20e1..0000000 --- a/src/main/java/reciter/model/article/ReciterFeedbackOrcid.java +++ /dev/null @@ -1,19 +0,0 @@ -package reciter.model.article; - -import lombok.Data; - -@Data -public class ReciterFeedbackOrcid { - - private String uid; - private long articleId; - private int countAccepted; - private int countRejected; - private int countNull; - private double scoreAll; - private double scoreWithout1Accepted; - private double scoreWithout1Rejected; - private int goldStandard; - private String orcid; - -} From 0247ebcaa7b99556db811aa0e05826dbb876694e Mon Sep 17 00:00:00 2001 From: mrj4001 Date: Tue, 17 Sep 2024 22:00:52 +0530 Subject: [PATCH 6/6] Code Cleanup for Reciter Feedback Scoring and modified as well --- .../reciter/model/article/ReCiterArticle.java | 21 +++-- .../article/ReCiterArticleFeedbackScore.java | 1 + .../article/ReCiterFeedbackScoreArticle.java | 91 ------------------- .../article/ReCiterFeedbackScoreCites.java | 10 -- .../ReCiterFeedbackScoreCoAuthorName.java | 11 --- .../article/ReCiterFeedbackScoreEmail.java | 13 --- .../ReCiterFeedbackScoreInstitution.java | 10 -- .../article/ReCiterFeedbackScoreJournal.java | 17 ---- .../article/ReCiterFeedbackScoreKeyword.java | 11 --- .../article/ReCiterFeedbackScoreOrcid.java | 10 -- ...ReCiterFeedbackScoreOrcidCoAuthorName.java | 12 --- .../ReCiterFeedbackScoreOrganization.java | 10 -- .../ReCiterFeedbackScoreTargetAuthorName.java | 11 --- .../article/ReCiterFeedbackScoreYear.java | 11 --- 14 files changed, 12 insertions(+), 227 deletions(-) delete mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreArticle.java delete mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreCites.java delete mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreCoAuthorName.java delete mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreEmail.java delete mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreInstitution.java delete mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreJournal.java delete mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreKeyword.java delete mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcid.java delete mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcidCoAuthorName.java delete mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreOrganization.java delete mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreTargetAuthorName.java delete mode 100644 src/main/java/reciter/model/article/ReCiterFeedbackScoreYear.java diff --git a/src/main/java/reciter/model/article/ReCiterArticle.java b/src/main/java/reciter/model/article/ReCiterArticle.java index dc4aad0..173fa36 100644 --- a/src/main/java/reciter/model/article/ReCiterArticle.java +++ b/src/main/java/reciter/model/article/ReCiterArticle.java @@ -92,9 +92,6 @@ public class ReCiterArticle implements Comparable { @Transient private ScopusArticle scopusArticle; - @Transient - private ReCiterFeedbackScoreArticle feedbackScoreArticle; - //Feedback final scores private double coAuthorNameFeedbackScore; private double keywordFeedackScore; @@ -124,6 +121,7 @@ public class ReCiterArticle implements Comparable { private String exportedOrganizationFeedbackScore; private String exportedTargetAuthorNameFeedbackScore; private String exportedYearFeedbackScore; + private Map> articleFeedbackScoresMap; /** @@ -501,6 +499,7 @@ public void setPmids(List pmids) { @JsonCreator public ReCiterArticle(long articleId) { this.articleId = articleId; + this.articleFeedbackScoresMap = new HashMap<>(); } @Override @@ -1025,13 +1024,7 @@ public GenderEvidence getGenderEvidence() { public void setGenderEvidence(GenderEvidence genderEvidence) { this.genderEvidence = genderEvidence; } - public ReCiterFeedbackScoreArticle getFeedbackScoreArticle() { - return feedbackScoreArticle; - } - - public void setFeedbackScoreArticle(ReCiterFeedbackScoreArticle feedbackScoreArticle) { - this.feedbackScoreArticle = feedbackScoreArticle; - } + public double getCoAuthorNameFeedbackScore() { return coAuthorNameFeedbackScore; } @@ -1255,4 +1248,12 @@ public String getExportedYearFeedbackScore() { public void setExportedYearFeedbackScore(String exportedYearFeedbackScore) { this.exportedYearFeedbackScore = exportedYearFeedbackScore; } + + public Map> getArticleFeedbackScoresMap() { + return articleFeedbackScoresMap; + } + + public void addArticleFeedbackScoresMap(Map> articleFeedbackScoresMap) { + this.articleFeedbackScoresMap.putAll(articleFeedbackScoresMap); + } } diff --git a/src/main/java/reciter/model/article/ReCiterArticleFeedbackScore.java b/src/main/java/reciter/model/article/ReCiterArticleFeedbackScore.java index 818e836..b2b3ada 100644 --- a/src/main/java/reciter/model/article/ReCiterArticleFeedbackScore.java +++ b/src/main/java/reciter/model/article/ReCiterArticleFeedbackScore.java @@ -18,5 +18,6 @@ public class ReCiterArticleFeedbackScore { private double feedbackScore; private int goldStandard; private String exportedFeedbackScore; + private String feedbackScoreType; } diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreArticle.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreArticle.java deleted file mode 100644 index 665d61e..0000000 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreArticle.java +++ /dev/null @@ -1,91 +0,0 @@ -package reciter.model.article; - -import java.util.ArrayList; -import java.util.List; - -import lombok.Data; - -@Data -public class ReCiterFeedbackScoreArticle { - - //private String personIdentifier; - private int acceptedCount; - private int rejectedCount; - private int countNull; - private double scoreAll; - private long citedPmid; - private List coAuthorNameList; - private String email; - private String institution; - private String journalTitle; - private String journalDomain; - private String journalField; - private String journalSubField; - private String keyword; - private String orcid; - private String coAuthorOrcid; - private double sumAccepted; - private double sumRejected; - private String organization; - private long articleYear; - - - - //Feedback countAccepted scoring - private double countAccepted; - //Feedback countRejected scoring - private double countRejected; - //Feedback countScoreAll scoring - private double countScoreAll; - //Feedback scoreWithout1Accepted scoring - private double scoreWithout1Accepted; - //Feedback ScoreWithout1Rejected scoring - private double scoreWithout1Rejected; - - //Feedback journal level scoring - private double feedbackScoreJournal; - //Feedback Orcid level scoring - private double feedbackScoreOrcid; - //Feedback Year level scoring - private double feedbackScoreYear; - //Feedback Email level scoring - private double feedbackScoreEmail; - //Feedback Journal Domain level scoring - private double feedbackScoreJournalDomain; - //Feedback Journal Field level scoring - private double feedbackScoreJournalField; - //Feedback Journal Sub Field level scoring - private double feedbackScoreJournalSubField; - //Feedback Keyword level scoring - private double feedbackScoreKeyword; - //Feedback TargetAuthorName level scoring - private double feedbackScoreTargetAuthorName; - //Feedback TargetAuthorName level scoring - private double feedbackScoreInstitution; - //Feedback TargetAuthorName level scoring - private double feedbackScoreOrganization; - //Feedback CoAuthorName level scoring - private double feedbackScoreCoAuthorName; - //Feedback OrcidCoAuthorName level scoring - private double feedbackScoreOrcidCoAuthor; - //Feedback OrcidCoAuthorName level scoring - private double feedbackScoreCitedPmid; - //Feedback feedbackScoreCoAuthorOrcid level scoring - private double feedbackScoreCoAuthorOrcid; - //Feedback feedbackScoreCites level scoring - private double feedbackScoreCites; - //Feedback articleTargetAuthorName scoring - private String articleTargetAuthorName; - - public ReCiterFeedbackScoreArticle() - { - coAuthorNameList = new ArrayList<>(); - } - - // Setter method for count that prevents direct setting - public void addToCoAuthorNameList(String coAuthorName) { - this.coAuthorNameList.add(coAuthorName); - } - - -} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreCites.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreCites.java deleted file mode 100644 index 501b8db..0000000 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreCites.java +++ /dev/null @@ -1,10 +0,0 @@ -package reciter.model.article; - -import lombok.Data; - -@Data -public class ReCiterFeedbackScoreCites{ - - private long citedPmid; - private double feedbackScoreCites; -} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreCoAuthorName.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreCoAuthorName.java deleted file mode 100644 index fe9b539..0000000 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreCoAuthorName.java +++ /dev/null @@ -1,11 +0,0 @@ -package reciter.model.article; - -import lombok.Data; - -@Data -public class ReCiterFeedbackScoreCoAuthorName { - - private String coAuthorName; - private double feedbackScoreCoAuthorName; - -} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreEmail.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreEmail.java deleted file mode 100644 index fa2fe0a..0000000 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreEmail.java +++ /dev/null @@ -1,13 +0,0 @@ -package reciter.model.article; - -import java.util.Date; - -import lombok.Data; - -@Data -public class ReCiterFeedbackScoreEmail /* extends ReCiterFeedbackScoreArticle*/ { - - private String email; - private double feedbackScoreEmail; - -} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreInstitution.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreInstitution.java deleted file mode 100644 index 6c828e4..0000000 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreInstitution.java +++ /dev/null @@ -1,10 +0,0 @@ -package reciter.model.article; - -import lombok.Data; - -@Data -public class ReCiterFeedbackScoreInstitution /*extends ReCiterFeedbackScoreArticle*/ { - - private String institution; - private double feedbackScoreInstitution; -} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreJournal.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreJournal.java deleted file mode 100644 index 21c97e2..0000000 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreJournal.java +++ /dev/null @@ -1,17 +0,0 @@ -package reciter.model.article; - -import lombok.Data; - -@Data -public class ReCiterFeedbackScoreJournal /*extends ReCiterFeedbackScoreArticle*/{ - - private String journalTitle; - private String journalDomain; - private String journalField; - private String journalSubField; - private double feedbackScoreJournal; - private double feedbackScoreJournalDomain; - private double feedbackScoreJournalField; - private double feedbackScoreJournalSubField; -} - \ No newline at end of file diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreKeyword.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreKeyword.java deleted file mode 100644 index bfc2cbd..0000000 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreKeyword.java +++ /dev/null @@ -1,11 +0,0 @@ -package reciter.model.article; - -import lombok.Data; - - -@Data -public class ReCiterFeedbackScoreKeyword /*extends ReCiterFeedbackScoreArticle*/{ - - private String keyword; - private double feedbackScoreKeyword; -} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcid.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcid.java deleted file mode 100644 index d7c0a61..0000000 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcid.java +++ /dev/null @@ -1,10 +0,0 @@ -package reciter.model.article; - -import lombok.Data; - -@Data -public class ReCiterFeedbackScoreOrcid /*extends ReCiterFeedbackScoreArticle*/{ - - private String orcid; - private double feedbackScoreOrcid; -} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcidCoAuthorName.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcidCoAuthorName.java deleted file mode 100644 index dcba976..0000000 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrcidCoAuthorName.java +++ /dev/null @@ -1,12 +0,0 @@ -package reciter.model.article; - -import lombok.Data; - -@Data -public class ReCiterFeedbackScoreOrcidCoAuthorName /*extends ReCiterFeedbackScoreArticle*/{ - - private String coAuthorOrcid; - private double feedbackScoreCoAuthorOrcid; - private double sumAccepted; - private double sumRejected; -} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrganization.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrganization.java deleted file mode 100644 index b11e33c..0000000 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreOrganization.java +++ /dev/null @@ -1,10 +0,0 @@ -package reciter.model.article; - -import lombok.Data; -@Data -public class ReCiterFeedbackScoreOrganization /*extends ReCiterFeedbackScoreArticle*/{ - - private String organization; - private double feedbackScoreOrganization; - -} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreTargetAuthorName.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreTargetAuthorName.java deleted file mode 100644 index 28e937c..0000000 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreTargetAuthorName.java +++ /dev/null @@ -1,11 +0,0 @@ -package reciter.model.article; - -import lombok.Data; - -@Data -public class ReCiterFeedbackScoreTargetAuthorName /*extends ReCiterFeedbackScoreArticle*/{ - - private String articleTargetAuthorName; - private double feedbackScoreTargetAuthorName; - -} diff --git a/src/main/java/reciter/model/article/ReCiterFeedbackScoreYear.java b/src/main/java/reciter/model/article/ReCiterFeedbackScoreYear.java deleted file mode 100644 index 2808e73..0000000 --- a/src/main/java/reciter/model/article/ReCiterFeedbackScoreYear.java +++ /dev/null @@ -1,11 +0,0 @@ -package reciter.model.article; - -import lombok.Data; - -@Data -public class ReCiterFeedbackScoreYear /*extends ReCiterFeedbackScoreArticle*/{ - - private long articleYear; - private double feedbackScoreYear; - -}