Skip to content

Commit

Permalink
Release RapidMiner 7.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonas Wilms-Pfau committed Aug 25, 2017
1 parent 4d6847d commit f50d004
Show file tree
Hide file tree
Showing 8 changed files with 92 additions and 154 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=7.6.0
version=7.6.1
group=com.rapidminer.studio
6 changes: 4 additions & 2 deletions src/main/java/com/rapidminer/RapidMiner.java
Original file line number Diff line number Diff line change
Expand Up @@ -966,14 +966,16 @@ public synchronized static void quit(final ExitMode exitMode) {
for (Runnable hook : shutdownHooks) {
try {
hook.run();
} catch (Exception e) {
} catch (Throwable e) {
// catching Throwable because this also accounts for things like ExceptionInInitializerErrors
LogService.getRoot().log(Level.WARNING, I18N.getMessage(LogService.getRoot().getResourceBundle(),
"com.rapidminer.RapidMiner.executing_shotdown_hook_error", e.getMessage()), e);
}
}
try {
Runtime.getRuntime().runFinalization();
} catch (Exception e) {
} catch (Throwable e) {
// catching Throwable because this also accounts for things like ExceptionInInitializerErrors
LogService.getRoot().log(Level.WARNING, I18N.getMessage(LogService.getRoot().getResourceBundle(),
"com.rapidminer.RapidMiner.error_during_finalization", e.getMessage()), e);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public interface NominalMapping extends Cloneable, Serializable {
public void setMapping(String nominalValue, int index);

/**
* Returns a list of all nominal values which were mapped via {@link #mapString(String)} until
* Returns an unmodifiable list of all nominal values which were mapped via {@link #mapString(String)} until
* now.
*/
public List<String> getValues();
Expand Down
18 changes: 11 additions & 7 deletions src/main/java/com/rapidminer/gui/RapidMinerGUI.java
Original file line number Diff line number Diff line change
Expand Up @@ -280,13 +280,17 @@ private static class ShutdownHook extends Thread {

@Override
public void run() {
LogService.getRoot().log(Level.INFO, "com.rapidminer.gui.RapidMinerGUI.running_shutdown_sequence");
RapidMinerGUI.saveRecentFileList();
RapidMinerGUI.saveGUIProperties();
UsageStatistics.getInstance().save();
RepositoryManager.shutdown();
UsageStatsTransmissionDialog.transmitOnShutdown();
CallToActionScheduler.INSTANCE.shutdown();
// only need to do these if at least the MainFrame came up successfully.
// Otherwise saving might even be detrimental!
if (RapidMinerGUI.getMainFrame() != null) {
LogService.getRoot().log(Level.INFO, "com.rapidminer.gui.RapidMinerGUI.running_shutdown_sequence");
RapidMinerGUI.saveRecentFileList();
RapidMinerGUI.saveGUIProperties();
UsageStatistics.getInstance().save();
RepositoryManager.shutdown();
UsageStatsTransmissionDialog.transmitOnShutdown();
CallToActionScheduler.INSTANCE.shutdown();
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,9 @@ public ExampleSet performPrediction(ExampleSet exampleSet, Attribute predictedLa
// check if one class SVM is used
if (model.param.svm_type == LibSVMLearner.SVM_TYPE_ONE_CLASS) {
// if yes, then clear predictedLabel mapping: We use a fixed one
predictedLabel.getMapping().getValues().clear();
predictedLabel.getMapping().getValues().add("outside");
predictedLabel.getMapping().getValues().add("inside");
predictedLabel.getMapping().clear();
predictedLabel.getMapping().mapString("outside");
predictedLabel.getMapping().mapString("inside");

// create own confidence attribute
Attribute confidenceAttribute = AttributeFactory.createAttribute(Attributes.CONFIDENCE_NAME + "(inside)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public Element getXML(String key, String value, boolean hideDefault, Document do
if (value != null) {
list = transformString2Enumeration(value);
} else {
list = (String[]) getDefaultValue();
list = transformString2Enumeration(getDefaultValueAsString());
}
if (list != null) {
for (String string : list) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

package com.rapidminer.repository;

import java.util.Comparator;

import com.rapidminer.repository.gui.RepositoryBrowser;


Expand All @@ -29,6 +31,17 @@
* @since 7.4
*
*/
public enum RepositorySortingMethod {
NAME_ASC, LAST_MODIFIED_DATE_DESC;
public enum RepositorySortingMethod implements Comparator<Entry> {
NAME_ASC(RepositoryTools.ENTRY_COMPARATOR) {
}, LAST_MODIFIED_DATE_DESC(RepositoryTools.ENTRY_COMPARATOR_LAST_MODIFIED);

private final Comparator<Entry> comparator;

RepositorySortingMethod(Comparator<Entry> comparator){
this.comparator = comparator;
}

public int compare(Entry o1, Entry o2) {
return comparator.compare(o1, o2);
}
}

0 comments on commit f50d004

Please sign in to comment.