|
@@ -81,7 +81,7 @@ public class ExtremalLayoutCalc implements AlgorithmStage {
|
|
{
|
|
{
|
|
LayoutState oldState = status;
|
|
LayoutState oldState = status;
|
|
StageStatus stage = StageStatus.UNFINISHED;
|
|
StageStatus stage = StageStatus.UNFINISHED;
|
|
- while( status == oldState && stage != StageStatus.FINISHED )
|
|
|
|
|
|
+ while( status == oldState && stage == StageStatus.UNFINISHED )
|
|
stage = forwardStep();
|
|
stage = forwardStep();
|
|
return stage;
|
|
return stage;
|
|
}
|
|
}
|
|
@@ -94,7 +94,7 @@ public class ExtremalLayoutCalc implements AlgorithmStage {
|
|
if( !inside )
|
|
if( !inside )
|
|
{
|
|
{
|
|
StageStatus status = StageStatus.UNFINISHED;
|
|
StageStatus status = StageStatus.UNFINISHED;
|
|
- while( status != StageStatus.FINISHED )
|
|
|
|
|
|
+ while( status == StageStatus.UNFINISHED )
|
|
status = forwardStep();
|
|
status = forwardStep();
|
|
return status;
|
|
return status;
|
|
}
|
|
}
|
|
@@ -108,7 +108,7 @@ public class ExtremalLayoutCalc implements AlgorithmStage {
|
|
{
|
|
{
|
|
LayoutState oldState = status;
|
|
LayoutState oldState = status;
|
|
StageStatus stage = StageStatus.UNFINISHED;
|
|
StageStatus stage = StageStatus.UNFINISHED;
|
|
- while( status == oldState && stage != StageStatus.FINISHED )
|
|
|
|
|
|
+ while( status == oldState && stage == StageStatus.UNFINISHED )
|
|
stage = backwardStep();
|
|
stage = backwardStep();
|
|
return stage;
|
|
return stage;
|
|
}
|
|
}
|
|
@@ -121,7 +121,7 @@ public class ExtremalLayoutCalc implements AlgorithmStage {
|
|
if( !inside )
|
|
if( !inside )
|
|
{
|
|
{
|
|
StageStatus status = StageStatus.UNFINISHED;
|
|
StageStatus status = StageStatus.UNFINISHED;
|
|
- while( status != StageStatus.FINISHED )
|
|
|
|
|
|
+ while( status == StageStatus.UNFINISHED )
|
|
status = backwardStep();
|
|
status = backwardStep();
|
|
return status;
|
|
return status;
|
|
}
|
|
}
|
|
@@ -155,7 +155,7 @@ public class ExtremalLayoutCalc implements AlgorithmStage {
|
|
else if( status == LayoutState.COMPACTION )
|
|
else if( status == LayoutState.COMPACTION )
|
|
{
|
|
{
|
|
if( !cpNode.isSelected() )
|
|
if( !cpNode.isSelected() )
|
|
- breakpoint |= !cpNode.setSelected( true );
|
|
|
|
|
|
+ breakpoint |= !cpNode.setSelected( true );
|
|
switch( (StageStatus)(Compaction.class.getMethod( fName ).invoke( cp ) ) )
|
|
switch( (StageStatus)(Compaction.class.getMethod( fName ).invoke( cp ) ) )
|
|
{
|
|
{
|
|
case FINISHED:
|
|
case FINISHED:
|