Skip to content

Commit

Permalink
Change singluar *tag fields to plurals in ConferenceParametrization
Browse files Browse the repository at this point in the history
  • Loading branch information
@ge0ffrey
Musa Talluzi authored and ge0ffrey committed Sep 4, 2018
1 parent df8aefe commit 075dbc0
Show file tree
Hide file tree
Showing 4 changed files with 368 additions and 370 deletions.
204 changes: 102 additions & 102 deletions .../java/org/optaplanner/examples/conferencescheduling/domain/ConferenceParametrization.java
View file
Expand Up @@ -26,15 +26,15 @@ public class ConferenceParametrization extends AbstractPersistable {
public static final String ROOM_CONFLICT = "Room conflict"; public static final String ROOM_CONFLICT = "Room conflict";
public static final String SPEAKER_UNAVAILABLE_TIMESLOT = "Speaker unavailable timeslot"; public static final String SPEAKER_UNAVAILABLE_TIMESLOT = "Speaker unavailable timeslot";
public static final String SPEAKER_CONFLICT = "Speaker conflict"; public static final String SPEAKER_CONFLICT = "Speaker conflict";
public static final String SPEAKER_REQUIRED_TIMESLOT_TAG = "Speaker required timeslot tag"; public static final String SPEAKER_REQUIRED_TIMESLOT_TAGS = "Speaker required timeslot tag";
public static final String SPEAKER_PROHIBITED_TIMESLOT_TAG = "Speaker prohibited timeslot tag"; public static final String SPEAKER_PROHIBITED_TIMESLOT_TAGs = "Speaker prohibited timeslot tag";
public static final String TALK_REQUIRED_TIMESLOT_TAG = "Talk required timeslot tag"; public static final String TALK_REQUIRED_TIMESLOT_TAGS = "Talk required timeslot tag";
public static final String TALK_PROHIBITED_TIMESLOT_TAG = "Talk prohibited timeslot tag"; public static final String TALK_PROHIBITED_TIMESLOT_TAGS = "Talk prohibited timeslot tag";
public static final String SPEAKER_REQUIRED_ROOM_TAG = "Speaker required room tag"; public static final String SPEAKER_REQUIRED_ROOM_TAGS = "Speaker required room tag";
public static final String SPEAKER_PROHIBITED_ROOM_TAG = "Speaker prohibited room tag"; public static final String SPEAKER_PROHIBITED_ROOM_TAGS = "Speaker prohibited room tag";
public static final String TALK_REQUIRED_ROOM_TAG = "Talk required room tag"; public static final String TALK_REQUIRED_ROOM_TAGS = "Talk required room tag";
public static final String TALK_PROHIBITED_ROOM_TAG = "Talk prohibited room tag"; public static final String TALK_PROHIBITED_ROOM_TAGS = "Talk prohibited room tag";
public static final String TALK_MUTUALLY_EXCLUSIVE_TALKS_TAG = "Talk mutually-exclusive-talks tag"; public static final String TALK_MUTUALLY_EXCLUSIVE_TALKS_TAGS = "Talk mutually-exclusive-talks tag";
public static final String TALK_PREREQUISITE_TALKS = "Talk prerequisite talks"; public static final String TALK_PREREQUISITE_TALKS = "Talk prerequisite talks";


public static final String THEME_TRACK_CONFLICT = "Theme track conflict"; public static final String THEME_TRACK_CONFLICT = "Theme track conflict";
Expand All @@ -45,14 +45,14 @@ public class ConferenceParametrization extends AbstractPersistable {
public static final String AUDIENCE_LEVEL_FLOW_PER_CONTENT_VIOLATION = "Audience level flow per content violation"; public static final String AUDIENCE_LEVEL_FLOW_PER_CONTENT_VIOLATION = "Audience level flow per content violation";
public static final String CONTENT_CONFLICT = "Content conflict"; public static final String CONTENT_CONFLICT = "Content conflict";
public static final String LANGUAGE_DIVERSITY = "Language diversity"; public static final String LANGUAGE_DIVERSITY = "Language diversity";
public static final String SPEAKER_PREFERRED_TIMESLOT_TAG = "Speaker preferred timeslot tag"; public static final String SPEAKER_PREFERRED_TIMESLOT_TAGS = "Speaker preferred timeslot tag";
public static final String SPEAKER_UNDESIRED_TIMESLOT_TAG = "Speaker undesired timeslot tag"; public static final String SPEAKER_UNDESIRED_TIMESLOT_TAGS = "Speaker undesired timeslot tag";
public static final String TALK_PREFERRED_TIMESLOT_TAG = "Talk preferred timeslot tag"; public static final String TALK_PREFERRED_TIMESLOT_TAGS = "Talk preferred timeslot tag";
public static final String TALK_UNDESIRED_TIMESLOT_TAG = "Talk undesired timeslot tag"; public static final String TALK_UNDESIRED_TIMESLOT_TAGS = "Talk undesired timeslot tag";
public static final String SPEAKER_PREFERRED_ROOM_TAG = "Speaker preferred room tag"; public static final String SPEAKER_PREFERRED_ROOM_TAGS = "Speaker preferred room tag";
public static final String SPEAKER_UNDESIRED_ROOM_TAG = "Speaker undesired room tag"; public static final String SPEAKER_UNDESIRED_ROOM_TAGS = "Speaker undesired room tag";
public static final String TALK_PREFERRED_ROOM_TAG = "Talk preferred room tag"; public static final String TALK_PREFERRED_ROOM_TAGS = "Talk preferred room tag";
public static final String TALK_UNDESIRED_ROOM_TAG = "Talk undesired room tag"; public static final String TALK_UNDESIRED_ROOM_TAGS = "Talk undesired room tag";
public static final String SAME_DAY_TALKS = "Same day talks"; public static final String SAME_DAY_TALKS = "Same day talks";


private int talkTypeOfTimeslot = 10000; private int talkTypeOfTimeslot = 10000;
Expand All @@ -61,15 +61,15 @@ public class ConferenceParametrization extends AbstractPersistable {
private int roomConflict = 10; private int roomConflict = 10;
private int speakerUnavailableTimeslot = 1; private int speakerUnavailableTimeslot = 1;
private int speakerConflict = 1; private int speakerConflict = 1;
private int speakerRequiredTimeslotTag = 1; private int speakerRequiredTimeslotTags = 1;
private int speakerProhibitedTimeslotTag = 1; private int speakerProhibitedTimeslotTags = 1;
private int talkRequiredTimeslotTag = 1; private int talkRequiredTimeslotTags = 1;
private int talkProhibitedTimeslotTag = 1; private int talkProhibitedTimeslotTags = 1;
private int speakerRequiredRoomTag = 1; private int speakerRequiredRoomTags = 1;
private int speakerProhibitedRoomTag = 1; private int speakerProhibitedRoomTags = 1;
private int talkRequiredRoomTag = 1; private int talkRequiredRoomTags = 1;
private int talkProhibitedRoomTag = 1; private int talkProhibitedRoomTags = 1;
private int talkMutuallyExclusiveTalksTag = 1; private int talkMutuallyExclusiveTalksTags = 1;
private int talkPrerequisiteTalks = 1; private int talkPrerequisiteTalks = 1;


private int themeTrackConflict = 10; private int themeTrackConflict = 10;
Expand All @@ -80,14 +80,14 @@ public class ConferenceParametrization extends AbstractPersistable {
private int audienceLevelFlowPerContentViolation = 10; private int audienceLevelFlowPerContentViolation = 10;
private int contentConflict = 100; private int contentConflict = 100;
private int languageDiversity = 10; private int languageDiversity = 10;
private int speakerPreferredTimeslotTag = 20; private int speakerPreferredTimeslotTags = 20;
private int speakerUndesiredTimeslotTag = 20; private int speakerUndesiredTimeslotTags = 20;
private int talkPreferredTimeslotTag = 20; private int talkPreferredTimeslotTags = 20;
private int talkUndesiredTimeslotTag = 20; private int talkUndesiredTimeslotTags = 20;
private int speakerPreferredRoomTag = 20; private int speakerPreferredRoomTags = 20;
private int speakerUndesiredRoomTag = 20; private int speakerUndesiredRoomTags = 20;
private int talkPreferredRoomTag = 20; private int talkPreferredRoomTags = 20;
private int talkUndesiredRoomTag = 20; private int talkUndesiredRoomTags = 20;
private int sameDayTalks = 10; private int sameDayTalks = 10;


public ConferenceParametrization() { public ConferenceParametrization() {
Expand Down Expand Up @@ -149,68 +149,68 @@ public void setSpeakerConflict(int speakerConflict) {
this.speakerConflict = speakerConflict; this.speakerConflict = speakerConflict;
} }


public int getSpeakerRequiredTimeslotTag() { public int getSpeakerRequiredTimeslotTags() {
return speakerRequiredTimeslotTag; return speakerRequiredTimeslotTags;
} }


public void setSpeakerRequiredTimeslotTag(int speakerRequiredTimeslotTag) { public void setSpeakerRequiredTimeslotTags(int speakerRequiredTimeslotTags) {
this.speakerRequiredTimeslotTag = speakerRequiredTimeslotTag; this.speakerRequiredTimeslotTags = speakerRequiredTimeslotTags;
} }


public int getSpeakerProhibitedTimeslotTag() { public int getSpeakerProhibitedTimeslotTags() {
return speakerProhibitedTimeslotTag; return speakerProhibitedTimeslotTags;
} }


public void setSpeakerProhibitedTimeslotTag(int speakerProhibitedTimeslotTag) { public void setSpeakerProhibitedTimeslotTags(int speakerProhibitedTimeslotTags) {
this.speakerProhibitedTimeslotTag = speakerProhibitedTimeslotTag; this.speakerProhibitedTimeslotTags = speakerProhibitedTimeslotTags;
} }


public int getTalkRequiredTimeslotTag() { public int getTalkRequiredTimeslotTags() {
return talkRequiredTimeslotTag; return talkRequiredTimeslotTags;
} }


public void setTalkRequiredTimeslotTag(int talkRequiredTimeslotTag) { public void setTalkRequiredTimeslotTags(int talkRequiredTimeslotTags) {
this.talkRequiredTimeslotTag = talkRequiredTimeslotTag; this.talkRequiredTimeslotTags = talkRequiredTimeslotTags;
} }


public int getTalkProhibitedTimeslotTag() { public int getTalkProhibitedTimeslotTags() {
return talkProhibitedTimeslotTag; return talkProhibitedTimeslotTags;
} }


public void setTalkProhibitedTimeslotTag(int talkProhibitedTimeslotTag) { public void setTalkProhibitedTimeslotTags(int talkProhibitedTimeslotTags) {
this.talkProhibitedTimeslotTag = talkProhibitedTimeslotTag; this.talkProhibitedTimeslotTags = talkProhibitedTimeslotTags;
} }


public int getSpeakerRequiredRoomTag() { public int getSpeakerRequiredRoomTags() {
return speakerRequiredRoomTag; return speakerRequiredRoomTags;
} }


public void setSpeakerRequiredRoomTag(int speakerRequiredRoomTag) { public void setSpeakerRequiredRoomTags(int speakerRequiredRoomTags) {
this.speakerRequiredRoomTag = speakerRequiredRoomTag; this.speakerRequiredRoomTags = speakerRequiredRoomTags;
} }


public int getSpeakerProhibitedRoomTag() { public int getSpeakerProhibitedRoomTags() {
return speakerProhibitedRoomTag; return speakerProhibitedRoomTags;
} }


public void setSpeakerProhibitedRoomTag(int speakerProhibitedRoomTag) { public void setSpeakerProhibitedRoomTags(int speakerProhibitedRoomTags) {
this.speakerProhibitedRoomTag = speakerProhibitedRoomTag; this.speakerProhibitedRoomTags = speakerProhibitedRoomTags;
} }


public int getTalkRequiredRoomTag() { public int getTalkRequiredRoomTags() {
return talkRequiredRoomTag; return talkRequiredRoomTags;
} }


public void setTalkRequiredRoomTag(int talkRequiredRoomTag) { public void setTalkRequiredRoomTags(int talkRequiredRoomTags) {
this.talkRequiredRoomTag = talkRequiredRoomTag; this.talkRequiredRoomTags = talkRequiredRoomTags;
} }


public int getTalkProhibitedRoomTag() { public int getTalkProhibitedRoomTags() {
return talkProhibitedRoomTag; return talkProhibitedRoomTags;
} }


public void setTalkProhibitedRoomTag(int talkProhibitedRoomTag) { public void setTalkProhibitedRoomTags(int talkProhibitedRoomTags) {
this.talkProhibitedRoomTag = talkProhibitedRoomTag; this.talkProhibitedRoomTags = talkProhibitedRoomTags;
} }


public int getThemeTrackConflict() { public int getThemeTrackConflict() {
Expand Down Expand Up @@ -277,76 +277,76 @@ public void setLanguageDiversity(int languageDiversity) {
this.languageDiversity = languageDiversity; this.languageDiversity = languageDiversity;
} }


public int getSpeakerPreferredTimeslotTag() { public int getSpeakerPreferredTimeslotTags() {
return speakerPreferredTimeslotTag; return speakerPreferredTimeslotTags;
} }


public void setSpeakerPreferredTimeslotTag(int speakerPreferredTimeslotTag) { public void setSpeakerPreferredTimeslotTags(int speakerPreferredTimeslotTags) {
this.speakerPreferredTimeslotTag = speakerPreferredTimeslotTag; this.speakerPreferredTimeslotTags = speakerPreferredTimeslotTags;
} }


public int getSpeakerUndesiredTimeslotTag() { public int getSpeakerUndesiredTimeslotTags() {
return speakerUndesiredTimeslotTag; return speakerUndesiredTimeslotTags;
} }


public void setSpeakerUndesiredTimeslotTag(int speakerUndesiredTimeslotTag) { public void setSpeakerUndesiredTimeslotTags(int speakerUndesiredTimeslotTags) {
this.speakerUndesiredTimeslotTag = speakerUndesiredTimeslotTag; this.speakerUndesiredTimeslotTags = speakerUndesiredTimeslotTags;
} }


public int getTalkPreferredTimeslotTag() { public int getTalkPreferredTimeslotTags() {
return talkPreferredTimeslotTag; return talkPreferredTimeslotTags;
} }


public void setTalkPreferredTimeslotTag(int talkPreferredTimeslotTag) { public void setTalkPreferredTimeslotTags(int talkPreferredTimeslotTags) {
this.talkPreferredTimeslotTag = talkPreferredTimeslotTag; this.talkPreferredTimeslotTags = talkPreferredTimeslotTags;
} }


public int getTalkUndesiredTimeslotTag() { public int getTalkUndesiredTimeslotTags() {
return talkUndesiredTimeslotTag; return talkUndesiredTimeslotTags;
} }


public void setTalkUndesiredTimeslotTag(int talkUndesiredTimeslotTag) { public void setTalkUndesiredTimeslotTags(int talkUndesiredTimeslotTags) {
this.talkUndesiredTimeslotTag = talkUndesiredTimeslotTag; this.talkUndesiredTimeslotTags = talkUndesiredTimeslotTags;
} }


public int getSpeakerPreferredRoomTag() { public int getSpeakerPreferredRoomTags() {
return speakerPreferredRoomTag; return speakerPreferredRoomTags;
} }


public void setSpeakerPreferredRoomTag(int speakerPreferredRoomTag) { public void setSpeakerPreferredRoomTags(int speakerPreferredRoomTags) {
this.speakerPreferredRoomTag = speakerPreferredRoomTag; this.speakerPreferredRoomTags = speakerPreferredRoomTags;
} }


public int getSpeakerUndesiredRoomTag() { public int getSpeakerUndesiredRoomTags() {
return speakerUndesiredRoomTag; return speakerUndesiredRoomTags;
} }


public void setSpeakerUndesiredRoomTag(int speakerUndesiredRoomTag) { public void setSpeakerUndesiredRoomTags(int speakerUndesiredRoomTags) {
this.speakerUndesiredRoomTag = speakerUndesiredRoomTag; this.speakerUndesiredRoomTags = speakerUndesiredRoomTags;
} }


public int getTalkPreferredRoomTag() { public int getTalkPreferredRoomTags() {
return talkPreferredRoomTag; return talkPreferredRoomTags;
} }


public void setTalkPreferredRoomTag(int talkPreferredRoomTag) { public void setTalkPreferredRoomTags(int talkPreferredRoomTags) {
this.talkPreferredRoomTag = talkPreferredRoomTag; this.talkPreferredRoomTags = talkPreferredRoomTags;
} }


public int getTalkUndesiredRoomTag() { public int getTalkUndesiredRoomTags() {
return talkUndesiredRoomTag; return talkUndesiredRoomTags;
} }


public void setTalkUndesiredRoomTag(int talkUndesiredRoomTag) { public void setTalkUndesiredRoomTags(int talkUndesiredRoomTags) {
this.talkUndesiredRoomTag = talkUndesiredRoomTag; this.talkUndesiredRoomTags = talkUndesiredRoomTags;
} }


public int getTalkMutuallyExclusiveTalksTag() { public int getTalkMutuallyExclusiveTalksTags() {
return talkMutuallyExclusiveTalksTag; return talkMutuallyExclusiveTalksTags;
} }


public void setTalkMutuallyExclusiveTalksTag(int talkMutuallyExclusiveTalksTag) { public void setTalkMutuallyExclusiveTalksTags(int talkMutuallyExclusiveTalksTags) {
this.talkMutuallyExclusiveTalksTag = talkMutuallyExclusiveTalksTag; this.talkMutuallyExclusiveTalksTags = talkMutuallyExclusiveTalksTags;
} }


public int getTalkPrerequisiteTalks() { public int getTalkPrerequisiteTalks() {
Expand Down

0 comments on commit 075dbc0

Please sign in to comment.