|
@@ -108,8 +108,8 @@ public class Compaction implements AlgorithmStage{
|
|
f.v = getNodeFromIndex( vIndex );
|
|
f.v = getNodeFromIndex( vIndex );
|
|
double oldX = f.v.getX( layout ); // nötig für "undo"
|
|
double oldX = f.v.getX( layout ); // nötig für "undo"
|
|
f.v.setX( 0, true, layout );
|
|
f.v.setX( 0, true, layout );
|
|
- f.v.setSelected( layout ); // zeige knoten als aktiven knoten an
|
|
|
|
f.w = f.v;
|
|
f.w = f.v;
|
|
|
|
+ f.w.setSelected( layout ); // zeige knoten als aktiven knoten an
|
|
System.out.println( "call place_block( " + f.v + " )" );
|
|
System.out.println( "call place_block( " + f.v + " )" );
|
|
stack.add( 0, f );
|
|
stack.add( 0, f );
|
|
|
|
|
|
@@ -142,8 +142,8 @@ public class Compaction implements AlgorithmStage{
|
|
nsf.v = sf.u;
|
|
nsf.v = sf.u;
|
|
double oldX = nsf.v.getX( layout ); // nötig für "undo"
|
|
double oldX = nsf.v.getX( layout ); // nötig für "undo"
|
|
nsf.v.setX( 0, true, layout );
|
|
nsf.v.setX( 0, true, layout );
|
|
- nsf.v.setSelected( layout ); // zeige knoten als aktiven knoten an
|
|
|
|
nsf.w = nsf.v;
|
|
nsf.w = nsf.v;
|
|
|
|
+ nsf.w.setSelected( layout ); // zeige knoten als aktiven knoten an
|
|
System.out.println( "call place_block( " + nsf.v + " )" );
|
|
System.out.println( "call place_block( " + nsf.v + " )" );
|
|
stack.add( 0, nsf );
|
|
stack.add( 0, nsf );
|
|
|
|
|
|
@@ -158,7 +158,7 @@ public class Compaction implements AlgorithmStage{
|
|
else // nein
|
|
else // nein
|
|
{
|
|
{
|
|
// tue nix
|
|
// tue nix
|
|
- sf.u.setSelected( layout );
|
|
|
|
|
|
+ sf.w.setSelected( layout );
|
|
actions.add( 0, ()-> {
|
|
actions.add( 0, ()-> {
|
|
stack.get( 0 ).u = null;
|
|
stack.get( 0 ).u = null;
|
|
});
|
|
});
|
|
@@ -175,15 +175,15 @@ public class Compaction implements AlgorithmStage{
|
|
stack.remove( 0 );
|
|
stack.remove( 0 );
|
|
actions.add( 0, ()-> {
|
|
actions.add( 0, ()-> {
|
|
stack.add( 0, sf );
|
|
stack.add( 0, sf );
|
|
- sf.v.setSelected( layout );
|
|
|
|
sf.w = oldW;
|
|
sf.w = oldW;
|
|
|
|
+ sf.w.setSelected( layout );
|
|
});
|
|
});
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{ //nur "undo aktion" hinzufügen
|
|
{ //nur "undo aktion" hinzufügen
|
|
actions.add( 0, ()-> {
|
|
actions.add( 0, ()-> {
|
|
sf.w = oldW;
|
|
sf.w = oldW;
|
|
- sf.v.setSelected( layout );
|
|
|
|
|
|
+ sf.w.setSelected( layout );
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -198,7 +198,7 @@ public class Compaction implements AlgorithmStage{
|
|
boolean oldDef = !sf.v.isXUndefined( layout );
|
|
boolean oldDef = !sf.v.isXUndefined( layout );
|
|
|
|
|
|
// v für visualisierung markieren
|
|
// v für visualisierung markieren
|
|
- sf.v.setSelected( layout );
|
|
|
|
|
|
+ sf.w.setSelected( layout );
|
|
|
|
|
|
if( sf.v.getSink( layout ) == sf.v ) // sink[v] = v?
|
|
if( sf.v.getSink( layout ) == sf.v ) // sink[v] = v?
|
|
sf.v.setSink( sf.u.getSink( layout ), layout ); // sink[v] := sink[u]
|
|
sf.v.setSink( sf.u.getSink( layout ), layout ); // sink[v] := sink[u]
|
|
@@ -232,8 +232,8 @@ public class Compaction implements AlgorithmStage{
|
|
sinkOfU.setShift( oldShift, layout );
|
|
sinkOfU.setShift( oldShift, layout );
|
|
sf.u = oldU;
|
|
sf.u = oldU;
|
|
sf.v.setX( oldX, oldDef, layout );
|
|
sf.v.setX( oldX, oldDef, layout );
|
|
- sf.v.setSelected( layout );
|
|
|
|
sf.w = oldW;
|
|
sf.w = oldW;
|
|
|
|
+ sf.w.setSelected( layout );
|
|
});
|
|
});
|
|
}
|
|
}
|
|
else
|
|
else
|
|
@@ -243,8 +243,8 @@ public class Compaction implements AlgorithmStage{
|
|
sinkOfU.setShift( oldShift, layout );
|
|
sinkOfU.setShift( oldShift, layout );
|
|
sf.u = oldU;
|
|
sf.u = oldU;
|
|
sf.v.setX( oldX, oldDef, layout );
|
|
sf.v.setX( oldX, oldDef, layout );
|
|
- sf.v.setSelected( layout );
|
|
|
|
sf.w = oldW;
|
|
sf.w = oldW;
|
|
|
|
+ sf.w.setSelected( layout );
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}
|
|
}
|