Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Philipp Spohr
YoshikoWrapper
Commits
26552aa1
Commit
26552aa1
authored
Dec 14, 2017
by
Philipp Spohr
Browse files
Workaround for CyColumn being not tunable (as of now, Cyto 3.7 maybe?)
parent
a49f59eb
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/main/java/de/hhu/ba/yoshikoWrapper/core/ParameterSet.java
View file @
26552aa1
...
...
@@ -14,7 +14,7 @@ public class ParameterSet implements TunableValidator
public
int
timeLimit
=
-
1
;
@Tunable
(
description
=
"A column in the edge table containing weights"
,
context
=
"nogui"
)
public
CyColumn
weightColumn
;
public
String
weightColumn
Name
;
@Tunable
(
description
=
"A column containing boolean entries for edges that are to be treated as permanent"
,
context
=
"nogui"
)
public
CyColumn
permanentColumn
;
@Tunable
(
description
=
"A column containing boolean entries for edges that are to be treated as forbidden"
,
context
=
"nogui"
)
...
...
src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/MainPanel.java
View file @
26552aa1
...
...
@@ -346,7 +346,7 @@ public class MainPanel extends JPanel implements CytoPanelComponent {
private
ParameterSet
fetchParameters
(
CyNetwork
net
)
{
ParameterSet
ret
=
new
ParameterSet
();
ret
.
timeLimit
=
opModePanel
.
getTimeLimit
();
ret
.
weightColumn
=
ecPanel
.
getWeightColumn
();
ret
.
weightColumn
Name
=
ecPanel
.
getWeightColumn
()
.
getName
()
;
ret
.
permanentColumn
=
ecPanel
.
getPermanentColumn
();
ret
.
forbiddenColumn
=
ecPanel
.
getForbiddenColumn
();
ret
.
defaultInsertionCost
=
ecPanel
.
getDefaultInsertionCost
();
...
...
src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/SolutionTab.java
View file @
26552aa1
...
...
@@ -226,6 +226,9 @@ public class SolutionTab extends JPanel {
this
.
setLayout
(
layout
);
}
/**
* Simply disables the CCV and CMG graph to visually highlight the fact that those tasks are no longer possible
*/
public
void
invalidateResult
()
{
createClusterView
.
setEnabled
(
false
);
createMetaGraph
.
setEnabled
(
false
);
...
...
src/main/java/de/hhu/ba/yoshikoWrapper/tasks/AlgorithmTask.java
View file @
26552aa1
...
...
@@ -138,7 +138,7 @@ public class AlgorithmTask extends AbstractTask implements ObservableTask {
c_input
=
NetworkParser
.
parseNetwork
(
net
,
nodeMap
,
parameterSet
.
weightColumn
,
net
.
getDefaultEdgeTable
().
getColumn
(
parameterSet
.
weightColumn
Name
)
,
parameterSet
.
permanentColumn
,
parameterSet
.
forbiddenColumn
,
parameterSet
.
defaultDeletionCost
...
...
@@ -147,7 +147,7 @@ public class AlgorithmTask extends AbstractTask implements ObservableTask {
boolean
containsRealValues
=
GraphAnalyzer
.
containsRealValues
(
net
,
parameterSet
.
weightColumn
,
net
.
getDefaultEdgeTable
().
getColumn
(
parameterSet
.
weightColumn
Name
)
,
parameterSet
.
permanentColumn
,
parameterSet
.
forbiddenColumn
,
parameterSet
.
defaultInsertionCost
,
...
...
src/main/java/de/hhu/ba/yoshikoWrapper/tasks/CreateMetaGraphTask.java
View file @
26552aa1
...
...
@@ -20,6 +20,8 @@ import de.hhu.ba.yoshikoWrapper.cytoUtil.StyleManager;
import
de.hhu.ba.yoshikoWrapper.graphModel.YoshikoCluster
;
import
de.hhu.ba.yoshikoWrapper.graphModel.YoshikoSolution
;
//TODO: Should also not be possible / throw an exception if the result was invalidated (might currently just be disabled via GUI)
public
class
CreateMetaGraphTask
extends
AbstractTask
{
private
final
YoshikoSolution
solution
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment