minimization bug solved. correct elimination os inaccessible and usel…

…ess states.
davidbuzatto · Sep 29, 2023 · 1a245fa · 1a245fa
1 parent f49dd4a
commit 1a245fa
Show file tree

Hide file tree

Showing 22 changed files with 486 additions and 1,795 deletions.
diff --git a/TODO.txt b/TODO.txt
@@ -1,14 +1,5 @@
-Regular operations in FA -> organize in one menu like the rearrange algorithms
-    Union - OK
-    Concatenation - OK
-    Kleene Star - OK
-    Complement - OK
-    Intersection - OK, but buggy
-
-Rework state natural order (use label?)
-
-Highlight inacessible states
-Highlight nondeterminisms
+Highlight inacessible states (properties panel)
+Highlight nondeterminisms    (properties panel)
 
 Regular Expressions
 

diff --git a/pom.xml b/pom.xml
@@ -13,6 +13,7 @@
         <maven.compiler.target>18</maven.compiler.target>
         <exec.mainClass>br.com.davidbuzatto.yaas.YAAS</exec.mainClass>
         <production>false</production>
+        <debugAlgorithms>false</debugAlgorithms>
     </properties>
     <dependencies>
         <dependency>

diff --git a/src/main/java/br/com/davidbuzatto/yaas/gui/MainWindow.java b/src/main/java/br/com/davidbuzatto/yaas/gui/MainWindow.java
@@ -20,6 +20,7 @@
 import br.com.davidbuzatto.yaas.gui.fa.examples.FAExamples;
 import br.com.davidbuzatto.yaas.gui.fa.examples.FAExamplesForMinimizationTest;
 import br.com.davidbuzatto.yaas.gui.fa.FAInternalFrame;
+import br.com.davidbuzatto.yaas.gui.fa.examples.FAExamplesForRemoveUselessAndInaccessibleStates;
 import br.com.davidbuzatto.yaas.util.ApplicationConstants;
 import br.com.davidbuzatto.yaas.util.ApplicationPreferences;
 import br.com.davidbuzatto.yaas.util.CharacterConstants;
@@ -55,7 +56,7 @@ private void customInit() {
             menuMinimizationTest.setVisible( false );
             setExtendedState( MAXIMIZED_BOTH );
         } else {
-            createFAInternalFrame( FAExamplesForMinimizationTest.createDFAForMinimizationTest02(), true, true );
+            createFAInternalFrame( FAExamples.createDFAEndsWith00(), true, true );
         }
 
     }

diff --git a/src/main/java/br/com/davidbuzatto/yaas/gui/fa/FA.java b/src/main/java/br/com/davidbuzatto/yaas/gui/fa/FA.java
@@ -448,7 +448,6 @@ public Map<FAState, Map<Character, List<FAState>>> getDelta() {
                     }
                     li.add( t.getTargetState() );
                 }
-
             }
 
         }

diff --git a/src/main/java/br/com/davidbuzatto/yaas/gui/fa/FAInternalFrame.form b/src/main/java/br/com/davidbuzatto/yaas/gui/fa/FAInternalFrame.form
@@ -504,7 +504,7 @@
         <Component class="javax.swing.JButton" name="btnAddAllMissingTransitionsDFA">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/pencil_go.png"/>
+              <Image iconType="3" name="/transitionAddAll.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Add All Missing Transitions (Alt+Shift+T)"/>
             <Property name="focusable" type="boolean" value="false"/>
@@ -515,6 +515,22 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnAddAllMissingTransitionsDFAActionPerformed"/>
           </Events>
         </Component>
+        <Component class="javax.swing.JButton" name="btnRemoveInaccessibleAndUselessStates">
+          <Properties>
+            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+              <Image iconType="3" name="/stateRemoveUI.png"/>
+            </Property>
+            <Property name="toolTipText" type="java.lang.String" value="Remove Inaccessible and Useless States (Alt+Shift+DELETE)"/>
+            <Property name="focusable" type="boolean" value="false"/>
+            <Property name="horizontalTextPosition" type="int" value="0"/>
+            <Property name="verticalTextPosition" type="int" value="3"/>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnRemoveInaccessibleAndUselessStatesActionPerformed"/>
+          </Events>
+        </Component>
+        <Component class="javax.swing.JToolBar$Separator" name="sep03">
+        </Component>
         <Component class="javax.swing.JButton" name="btnGenerateEquivalentDFA">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
@@ -581,7 +597,7 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="btnShowTransitionControlsActionPerformed"/>
           </Events>
         </Component>
-        <Component class="javax.swing.JToolBar$Separator" name="sep03">
+        <Component class="javax.swing.JToolBar$Separator" name="sep04">
         </Component>
         <Component class="javax.swing.JToggleButton" name="btnShowGrid">
           <Properties>
@@ -608,7 +624,7 @@
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
         </Component>
-        <Component class="javax.swing.JToolBar$Separator" name="sep04">
+        <Component class="javax.swing.JToolBar$Separator" name="sep05">
         </Component>
         <Component class="javax.swing.JButton" name="btnRearrangeStates">
           <Properties>
@@ -624,7 +640,7 @@
             <EventHandler event="mouseReleased" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="btnRearrangeStatesMouseReleased"/>
           </Events>
         </Component>
-        <Component class="javax.swing.JToolBar$Separator" name="sep05">
+        <Component class="javax.swing.JToolBar$Separator" name="sep06">
         </Component>
         <Component class="javax.swing.JButton" name="btnZoomIn">
           <Properties>
-Original file line number
+Diff line change
@@ Expand Up @@
                         }
                         li.add( t.getTargetState() );
                     }
                 }
             }
@@ Expand Down @@