Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: add cardinality #83

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add cardinality #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions server/src/main/java/org/diskproject/server/repository/DiskRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,12 +870,29 @@ public List<Question> loadQuestionsFromKB(String url) {
KBObject vconstraints = kb.getPropertyValue(var,
SQOnt.getProperty(SQO.HAS_CONSTRAINT_QUERY));
KBObject vfixedOptions = kb.getPropertyValue(var, SQOnt.getProperty(SQO.HAS_FIXED_OPTIONS));
KBObject variableMinCardinality = kb.getPropertyValue(var, SQOnt.getProperty(SQO.MIN_CARDINALITY));
KBObject variableMaxCardinality = kb.getPropertyValue(var, SQOnt.getProperty(SQO.MAX_CARDINALITY));
if (vname != null) {
QuestionVariable q = new QuestionVariable(var.getID(), vname.getValueAsString(),
vconstraints == null ? null : vconstraints.getValueAsString());
if (vfixedOptions != null) {
q.setFixedOptions(vfixedOptions.getValueAsString().split("\\s*,\\s*"));
}
if (variableMinCardinality != null)
try{
q.setMinCardinality(Integer.parseInt(variableMinCardinality.getValueAsString()));
}
catch (Exception e) {
System.out.println("Error parsing min cardinality for variable " + vname);
}
if (variableMaxCardinality != null) {
try {
q.setMaxCardinality(Integer.parseInt(variableMaxCardinality.getValueAsString()));
}
catch (Exception e) {
System.out.println("Error parsing max cardinality for variable " + vname);
}
}
vars.add(q);
}
}
Expand Down Expand Up @@ -927,6 +944,8 @@ private List<List<String>> loadVariableOptions(String sid) throws Exception {
String varname = variable.getVarName();
String constraintQuery = variable.getConstraints();
String[] fixedoptions = variable.getFixedOptions();
Integer minCardinality = variable.getMinCardinality();
Integer maxCardinality = variable.getMaxCardinality();

// If there are fixed options, return these
if (fixedoptions != null) {
Expand Down
20 changes: 20 additions & 0 deletions shared/src/main/java/org/diskproject/shared/classes/question/QuestionVariable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ public class QuestionVariable {
String varname;
String constraints;
String[] fixedOptions;
Integer minCardinality;
Integer maxCardinality;

public QuestionVariable () {
}
Expand All @@ -13,6 +15,8 @@ public QuestionVariable (String id, String varname, String constraints) {
this.id = id;
this.varname = varname;
this.constraints = constraints;
this.maxCardinality = 1;
this.minCardinality = 1;
}

public String toString () {
Expand Down Expand Up @@ -52,4 +56,20 @@ public String[] getFixedOptions() {
public void setFixedOptions(String[] options) {
this.fixedOptions = options;
}

public Integer getMinCardinality() {
return minCardinality;
}

public void setMinCardinality(Integer minCardinality) {
this.minCardinality = minCardinality;
}

public Integer getMaxCardinality() {
return maxCardinality;
}

public void setMaxCardinality(Integer maxCardinality) {
this.maxCardinality = maxCardinality;
}
}
2 changes: 2 additions & 0 deletions shared/src/main/java/org/diskproject/shared/ontologies/SQO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ public class SQO {
public static final String HAS_VARIABLE_NAME = "hasVariableName";
public static final String HAS_CONSTRAINT_QUERY = "hasConstraints";
public static final String HAS_FIXED_OPTIONS = "hasFixedOptions";
public static final String MIN_CARDINALITY = "minCardinality";
public static final String MAX_CARDINALITY = "maxCardinality";
}