-
- Downloads
Merge remote-tracking branch 'origin/dev_general'
# Conflicts: # src/main/java/de/hhu/ba/yoshikoWrapper/core/YoshikoLoader.java
Showing
- src/main/java/de/hhu/ba/yoshikoWrapper/CyActivator.java 1 addition, 1 deletionsrc/main/java/de/hhu/ba/yoshikoWrapper/CyActivator.java
- src/main/java/de/hhu/ba/yoshikoWrapper/core/ConfigurationManager.java 6 additions, 6 deletions...a/de/hhu/ba/yoshikoWrapper/core/ConfigurationManager.java
- src/main/java/de/hhu/ba/yoshikoWrapper/core/ParameterSet.java 41 additions, 11 deletions...main/java/de/hhu/ba/yoshikoWrapper/core/ParameterSet.java
- src/main/java/de/hhu/ba/yoshikoWrapper/cytoUtil/GraphAnalyzer.java 18 additions, 2 deletions...java/de/hhu/ba/yoshikoWrapper/cytoUtil/GraphAnalyzer.java
- src/main/java/de/hhu/ba/yoshikoWrapper/help/HelpLinks.java 2 additions, 1 deletionsrc/main/java/de/hhu/ba/yoshikoWrapper/help/HelpLinks.java
- src/main/java/de/hhu/ba/yoshikoWrapper/swig/ClusterEditingSolutions.java 4 additions, 0 deletions...e/hhu/ba/yoshikoWrapper/swig/ClusterEditingSolutions.java
- src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterface.java 2 additions, 2 deletions.../java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterface.java
- src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java 2 additions, 1 deletion...va/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java
- src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ClusterCountChooser.java 56 additions, 0 deletions.../yoshikoWrapper/swing/components/ClusterCountChooser.java
- src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ColumnMapper.java 12 additions, 12 deletions.../hhu/ba/yoshikoWrapper/swing/components/ColumnMapper.java
- src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/EditCostPanel.java 17 additions, 15 deletions...hhu/ba/yoshikoWrapper/swing/components/EditCostPanel.java
- src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/IntegerInputField.java 6 additions, 6 deletions...ba/yoshikoWrapper/swing/components/IntegerInputField.java
- src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/MainPanel.java 7 additions, 6 deletions.../de/hhu/ba/yoshikoWrapper/swing/components/MainPanel.java
- src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/OperationModePanel.java 27 additions, 1 deletion...a/yoshikoWrapper/swing/components/OperationModePanel.java
- src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ResultPanel.java 1 addition, 2 deletions...e/hhu/ba/yoshikoWrapper/swing/components/ResultPanel.java
- src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/SolutionTab.java 11 additions, 6 deletions...e/hhu/ba/yoshikoWrapper/swing/components/SolutionTab.java
- src/main/java/de/hhu/ba/yoshikoWrapper/taskFactories/CommandTaskFactory.java 0 additions, 1 deletion...u/ba/yoshikoWrapper/taskFactories/CommandTaskFactory.java
- src/main/java/de/hhu/ba/yoshikoWrapper/tasks/AlgorithmTask.java 40 additions, 23 deletions...in/java/de/hhu/ba/yoshikoWrapper/tasks/AlgorithmTask.java
- src/main/java/de/hhu/ba/yoshikoWrapper/tasks/CreateClusterViewsTask.java 4 additions, 3 deletions...e/hhu/ba/yoshikoWrapper/tasks/CreateClusterViewsTask.java
- src/main/java/de/hhu/ba/yoshikoWrapper/tasks/CreateMetaGraphTask.java 7 additions, 2 deletions...a/de/hhu/ba/yoshikoWrapper/tasks/CreateMetaGraphTask.java
Loading
Please register or sign in to comment