Skip to content

Commit

Permalink
Changes for default mining options
Browse files Browse the repository at this point in the history
  • Loading branch information
@tchrapovic
tchrapovic committed Aug 9, 2023
1 parent eba164e commit 675baa7
Show file tree
Hide file tree
Showing 2 changed files with 108 additions and 38 deletions.
2 changes: 1 addition & 1 deletion ...a/com/evolveum/midpoint/gui/impl/page/admin/role/mining/panel/ExecuteClusteringPanel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<div class="d-flex flex-wrap gap-2 w-100">
<div class="col-12 d-flex justify-content-center">
<input class="btn btn-default btn-sm" style="width:150px" wicket:id="submit_default_option_search"
type="submit" value="Edit mining options"/>
type="submit" value="Change default options"/>
</div>
</div>

Expand Down
144 changes: 107 additions & 37 deletions ...a/com/evolveum/midpoint/gui/impl/page/admin/role/mining/panel/ExecuteClusteringPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,13 +210,16 @@ private void importRoleAnalysisClusteringResult(OperationResult result,
LabelWithHelpPanel occupancyLabel;
LabelWithHelpPanel minFrequencyLabel;

public Form<?> getDefaultDetectionForm() {
return (Form<?>) get("default_intersection_option_form");
}
public void defaultIntersectionForm() {

Form<?> form = new Form<>("default_intersection_option_form");
form.setOutputMarkupId(true);
form.setOutputMarkupPlaceholderTag(true);
form.setVisible(false);
add(form);
Form<?> defaultDetectionForm = new Form<>("default_intersection_option_form");
defaultDetectionForm.setOutputMarkupId(true);
defaultDetectionForm.setOutputMarkupPlaceholderTag(true);
defaultDetectionForm.setVisible(false);
add(defaultDetectionForm);

LabelWithHelpPanel labelMode = new LabelWithHelpPanel("searchMode_label",
Model.of("Search mode")) {
Expand All @@ -226,15 +229,20 @@ protected IModel<String> getHelpModel() {
}
};
labelMode.setOutputMarkupId(true);
form.add(labelMode);
defaultDetectionForm.add(labelMode);

TextField<Double> thresholdField = new TextField<>(ID_JACCARD_THRESHOLD_FIELD,
Model.of(clusterOptions.getSimilarity()));
thresholdField.setOutputMarkupId(true);
thresholdField.setOutputMarkupPlaceholderTag(true);
thresholdField.add(new EnableBehaviour(this::isEditMiningOptionAndJaccardMode));
TextField<Double> defaultDetectionSimilarityField = new TextField<>(ID_JACCARD_THRESHOLD_FIELD,
new LoadableModel<>() {
@Override
protected Double load() {
return clusterOptions.getDefaultJaccardThreshold();
}
});
defaultDetectionSimilarityField.setOutputMarkupId(true);
defaultDetectionSimilarityField.setOutputMarkupPlaceholderTag(true);
defaultDetectionSimilarityField.add(new EnableBehaviour(this::isEditMiningOptionAndJaccardMode));

form.add(thresholdField);
defaultDetectionForm.add(defaultDetectionSimilarityField);

LabelWithHelpPanel thresholdLabel = new LabelWithHelpPanel(ID_JACCARD_THRESHOLD_FIELD + "_label",
Model.of("Similarity")) {
Expand All @@ -244,15 +252,20 @@ protected IModel<String> getHelpModel() {
}
};
thresholdLabel.setOutputMarkupId(true);
form.add(thresholdLabel);
defaultDetectionForm.add(thresholdLabel);

TextField<Integer> intersectionField = new TextField<>("intersectionField",
Model.of(clusterOptions.getDefaultIntersectionSearch()));
new LoadableModel<>() {
@Override
protected Integer load() {
return clusterOptions.getDefaultIntersectionSearch();
}
});
intersectionField.setOutputMarkupId(true);
intersectionField.setOutputMarkupPlaceholderTag(true);
intersectionField.setVisible(true);
intersectionField.add(new EnableBehaviour(this::isEditMiningOption));
form.add(intersectionField);
defaultDetectionForm.add(intersectionField);
intersectionLabel = new LabelWithHelpPanel("intersection_label",
new LoadableModel<>() {
@Override
Expand All @@ -267,16 +280,21 @@ protected IModel<String> getHelpModel() {
};
intersectionLabel.setOutputMarkupId(true);
intersectionLabel.setOutputMarkupPlaceholderTag(true);
form.add(intersectionLabel);
defaultDetectionForm.add(intersectionLabel);

TextField<Integer> occupancyField = new TextField<>("minOccupancyField",
Model.of(clusterOptions.getDefaultOccupancySearch()));
new LoadableModel<Integer>() {
@Override
protected Integer load() {
return clusterOptions.getDefaultOccupancySearch();
}
});
occupancyField.setOutputMarkupId(true);
occupancyField.setOutputMarkupPlaceholderTag(true);
occupancyField.setVisible(true);
occupancyField.add(new EnableBehaviour(this::isEditMiningOption));

form.add(occupancyField);
defaultDetectionForm.add(occupancyField);
occupancyLabel = new LabelWithHelpPanel("occupancy_label",
new LoadableModel<>() {
@Override
Expand All @@ -291,15 +309,20 @@ protected IModel<String> getHelpModel() {
};
occupancyLabel.setOutputMarkupId(true);
occupancyLabel.setOutputMarkupPlaceholderTag(true);
form.add(occupancyLabel);
defaultDetectionForm.add(occupancyLabel);

TextField<Double> minFrequencyField = new TextField<>("minFrequency",
Model.of(clusterOptions.getDefaultMinFrequency()));
new LoadableModel<>() {
@Override
protected Double load() {
return clusterOptions.getDefaultMinFrequency();
}
});
minFrequencyField.setOutputMarkupId(true);
minFrequencyField.setOutputMarkupPlaceholderTag(true);
minFrequencyField.setVisible(true);
minFrequencyField.add(new EnableBehaviour(this::isEditMiningOption));
form.add(minFrequencyField);
defaultDetectionForm.add(minFrequencyField);
minFrequencyLabel = new LabelWithHelpPanel("minFrequency_label",
new LoadableModel<>() {
@Override
Expand All @@ -314,15 +337,20 @@ protected IModel<String> getHelpModel() {
};
minFrequencyLabel.setOutputMarkupId(true);
minFrequencyField.setOutputMarkupPlaceholderTag(true);
form.add(minFrequencyLabel);
defaultDetectionForm.add(minFrequencyLabel);

TextField<Double> maxFrequencyField = new TextField<>("maxFrequency",
Model.of(clusterOptions.getDefaultMaxFrequency()));
new LoadableModel<>() {
@Override
protected Double load() {
return clusterOptions.getDefaultMaxFrequency();
}
});
maxFrequencyField.setOutputMarkupId(true);
maxFrequencyField.setOutputMarkupPlaceholderTag(true);
maxFrequencyField.setVisible(true);
maxFrequencyField.add(new EnableBehaviour(this::isEditMiningOption));
form.add(maxFrequencyField);
defaultDetectionForm.add(maxFrequencyField);

LabelWithHelpPanel labelDetectMode = new LabelWithHelpPanel("detect_label",
Model.of("Process detection")) {
Expand All @@ -332,7 +360,7 @@ protected IModel<String> getHelpModel() {
}
};
labelDetectMode.setOutputMarkupId(true);
form.add(labelDetectMode);
defaultDetectionForm.add(labelDetectMode);

ChoiceRenderer<DETECT> rendererDetect = new ChoiceRenderer<>("displayString");

Expand All @@ -354,7 +382,7 @@ protected void onUpdate(AjaxRequestTarget target) {
modeSelectorDetect.setOutputMarkupPlaceholderTag(true);
modeSelectorDetect.setVisible(true);
modeSelectorDetect.add(new EnableBehaviour(this::isEditMiningOption));
form.add(modeSelectorDetect);
defaultDetectionForm.add(modeSelectorDetect);

ChoiceRenderer<RoleAnalysisDetectionModeType> renderer = new ChoiceRenderer<>("value");

Expand All @@ -366,29 +394,45 @@ protected void onUpdate(AjaxRequestTarget target) {
protected void onUpdate(AjaxRequestTarget target) {
RoleAnalysisDetectionModeType modelObject = searchModeSelector.getModelObject();
clusterOptions.setSearchMode(modelObject);
if (modelObject.equals(RoleAnalysisDetectionModeType.JACCARD)) {
defaultDetectionSimilarityField.setVisible(true);
target.add(defaultDetectionSimilarityField);
} else {
defaultDetectionSimilarityField.setVisible(false);
target.add(defaultDetectionSimilarityField);
}
}
});
searchModeSelector.setOutputMarkupId(true);
searchModeSelector.setOutputMarkupPlaceholderTag(true);
searchModeSelector.setVisible(true);
searchModeSelector.add(new EnableBehaviour(this::isEditMiningOption));
form.add(searchModeSelector);
defaultDetectionForm.add(searchModeSelector);

AjaxSubmitButton ajaxSubmitButton = new AjaxSubmitButton("submit_default_option_search") {
@Override
protected void onSubmit(AjaxRequestTarget ajaxRequestTarget) {
if (isEditClusterOption()) {
return;
}

if (isEditMiningOption()) {
setEditMiningOption(false);
clusterOptions.setDefaultIntersectionSearch(intersectionField.getModelObject());
clusterOptions.setDefaultOccupancySearch(occupancyField.getModelObject());
clusterOptions.setDefaultMinFrequency(minFrequencyField.getModelObject());
clusterOptions.setDefaultMaxFrequency(maxFrequencyField.getModelObject());
int intersection = Integer.parseInt(String.valueOf(intersectionField.getModelObject()));
int occupancy = Integer.parseInt(String.valueOf(occupancyField.getModelObject()));
double minFrequency = Double.parseDouble(String.valueOf(minFrequencyField.getModelObject()));
double maxFrequency = Double.parseDouble(String.valueOf(maxFrequencyField.getModelObject()));
double similarity = Double.parseDouble(String.valueOf(defaultDetectionSimilarityField.getModelObject()));

clusterOptions.setDefaultIntersectionSearch(intersection);
clusterOptions.setDefaultOccupancySearch(occupancy);
clusterOptions.setDefaultMinFrequency(minFrequency);
clusterOptions.setDefaultMaxFrequency(maxFrequency);

if (clusterOptions.getSearchMode().equals(RoleAnalysisDetectionModeType.JACCARD)) {
clusterOptions.setDefaultJaccardThreshold(thresholdField.getModelObject());
clusterOptions.setDefaultJaccardThreshold(similarity);
}

intersectionField.setEnabled(false);
this.add(AttributeAppender.replace("value",
createStringResource("RoleMining.edit.options.mining")));
this.add(AttributeAppender.replace("class", "btn btn-default btn-sm"));
Expand All @@ -399,6 +443,7 @@ protected void onSubmit(AjaxRequestTarget ajaxRequestTarget) {
this.add(AttributeAppender.replace("class", "btn btn-primary btn-sm"));
}

ajaxRequestTarget.add(defaultDetectionSimilarityField);
ajaxRequestTarget.add(executeClustering);
ajaxRequestTarget.add(intersectionField);
ajaxRequestTarget.add(occupancyField);
Expand All @@ -412,10 +457,10 @@ protected void onSubmit(AjaxRequestTarget ajaxRequestTarget) {
};
ajaxSubmitButton.setOutputMarkupId(true);
ajaxSubmitButton.setOutputMarkupPlaceholderTag(true);
form.add(ajaxSubmitButton);
defaultDetectionForm.add(ajaxSubmitButton);

add(form);
AjaxButton showAdditionalOptions = showDefaultMiningPanel(form);
add(defaultDetectionForm);
AjaxButton showAdditionalOptions = showDefaultMiningPanel(defaultDetectionForm);
add(showAdditionalOptions);

}
Expand Down Expand Up @@ -503,12 +548,22 @@ protected IModel<String> getHelpModel() {
labelName.setOutputMarkupId(true);
form.add(labelName);

RangeSliderPanel rangeSliderPanel = new RangeSliderPanel(ID_JACCARD_THRESHOLD_FIELD){
RangeSliderPanel rangeSliderPanel = new RangeSliderPanel(ID_JACCARD_THRESHOLD_FIELD) {
@Override
public int getMinValue() {
return 10;
}

@Override
public int getSliderWidth() {
return 90;
}

@Override
public String getSliderWidthUnit() {
return "%";
}

@Override
public int getMaxValue() {
return 100;
Expand Down Expand Up @@ -650,6 +705,7 @@ protected IModel<String> getHelpModel() {
@Override
protected void onUpdate(AjaxRequestTarget target) {
clusterOptions.setMode(modeSelector.getModelObject());

target.add(overlapLabel);
target.add(assignmentsLabel);
target.add(minMembers);
Expand All @@ -669,6 +725,10 @@ protected void onUpdate(AjaxRequestTarget target) {
@Override
protected void onSubmit(AjaxRequestTarget target) {

if(isEditMiningOption()){
return;
}

if (isEditClusterOption()) {
setEditClusterOption(false);
clusterOptions.setName(nameField.getModelObject());
Expand All @@ -680,6 +740,15 @@ protected void onSubmit(AjaxRequestTarget target) {
clusterOptions.setMinMembers(minMembers.getModelObject());
clusterOptions.setMinProperties(minAssign.getModelObject());
clusterOptions.setMaxProperties(maxAssign.getModelObject());

clusterOptions.setDefaultIntersectionSearch(minMembers.getModelObject());
clusterOptions.setDefaultOccupancySearch(minIntersectionField.getModelObject());
clusterOptions.setDefaultMinFrequency(0.3);
clusterOptions.setDefaultMaxFrequency(1.0);
clusterOptions.setDefaultJaccardThreshold(similarity);

target.add(getDefaultDetectionForm());

this.add(AttributeAppender.replace("value",
createStringResource("RoleMining.edit.options.cluster")));
this.add(AttributeAppender.replace("class", "btn btn-default btn-sm"));
Expand All @@ -693,6 +762,7 @@ protected void onSubmit(AjaxRequestTarget target) {
target.add(filterSubmitButton);
target.add(executeClustering);
target.add(nameField);
target.add(minMembers);
target.add(minAssign);
target.add(maxAssign);
target.add(rangeSliderPanel);
Expand Down

0 comments on commit 675baa7

Please sign in to comment.