Derivations, part2

aconversions/src/conversions/re2fa/BrzozowskiDerivative.cpp

@@ -92,7 +92,7 @@ RegExpElement * BrzozowskiDerivative::derivativeConcatenation( Concatenation * e
             l.push_back( e->clone() );
     }
-    if( containsEpsilon( * element->getElements( ).begin( ) ) )
+    if( RegExpUtils::containsEpsilon( * element->getElements( ).begin( ) ) )
     {
         Alternation* alt = new Alternation( );
         list<RegExpElement*> & al = alt->getElements( );
@@ -133,32 +133,4 @@ RegExpElement * BrzozowskiDerivative::derivativeSymbol( RegExpSymbol * element,
     return dSymbol == element->getSymbol( ) ? new RegExpSymbol( "" ) : NULL;
 }
-bool BrzozowskiDerivative::containsEpsilon( RegExpElement * element ) const
-{
-    Alternation* alternation = dynamic_cast<Alternation*>( element );
-    Concatenation* concatenation = dynamic_cast<Concatenation*>( element );
-    Iteration* iteration = dynamic_cast<Iteration*>( element );
-    RegExpSymbol* symbol = dynamic_cast<RegExpSymbol*>( element );
-
-    if( alternation )
-    {
-        for( auto e : alternation->getElements( ) )
-            if( containsEpsilon( e ) )
-                return true;
-
-        return false;
-    }
-
-    if( concatenation )
-    {
-        for( auto e : concatenation->getElements( ) )
-            if( ! containsEpsilon( e ) )
-                return false;
-
-        return true;
-    }
-
-    return iteration || ( symbol && *symbol == RegExpSymbol( "" ) );
-}
-
 } /* namespace conversions */

aconversions/src/conversions/re2fa/BrzozowskiDerivative.h

@@ -19,6 +19,7 @@
 #include "BrzozowskiDerivativeNormalize.h"
 #include "../../utils/ConversionException.h"
+#include "../../utils/RegExpUtils.h"
 namespace conversions
 {

aconversions/src/conversions/re2fa/Makefile

 all: are2fa.glushkov are2fa.brzozowski are2fa.thompson
 	mv are2fa.glushkov $(BIN_DIR)
-	#mv are2fa.brzozowski $(BIN_DIR)
+	mv are2fa.brzozowski $(BIN_DIR)
 	mv are2fa.thompson $(BIN_DIR)
 are2fa.glushkov: are2fa.glushkov.o Glushkov.o AbstractREtoFAConverter.o RegExpUtils.o ConversionException.o
 	$(LD) $(LDFLAGS) $^ -o $@
-are2fa.brzozowski: are2fa.brzozowski.o Brzozowski.o AbstractREtoFAConverter.o
-	#$(LD) $(LDFLAGS) $^ -o $@
+are2fa.brzozowski: are2fa.brzozowski.o Brzozowski.o AbstractREtoFAConverter.o BrzozowskiDerivative.o ConversionException.o BrzozowskiDerivativeNormalize.o RegExpUtils.o
+	$(LD) $(LDFLAGS) $^ -o $@
 are2fa.thompson: are2fa.thompson.o Thompson.o AbstractREtoFAConverter.o AutomatonUtils.o ConversionException.o
 	$(LD) $(LDFLAGS) $^ -o $@
-are2fa.brzozowski.o: are2fa.brzozowski.cpp Brzozowski.h AbstractREtoFAConverter.h
+are2fa.brzozowski.o: are2fa.brzozowski.cpp Brzozowski.h BrzozowskiDerivative.h BrzozowskiDerivativeNormalize.h AbstractREtoFAConverter.h
 	$(CXX) $(CXXFLAGS) $< -o $@
 are2fa.glushkov.o: are2fa.glushkov.cpp Glushkov.h AbstractREtoFAConverter.h
@@ -22,12 +22,19 @@ are2fa.glushkov.o: are2fa.glushkov.cpp Glushkov.h AbstractREtoFAConverter.h
 are2fa.thompson.o: are2fa.thompson.cpp Thompson.h AbstractREtoFAConverter.h
 	$(CXX) $(CXXFLAGS) $< -o $@
+
 AbstractREtoFAConverter.o: AbstractREtoFAConverter.cpp AbstractREtoFAConverter.h
 	$(CXX) $(CXXFLAGS) $< -o $@
 Brzozowski.o: Brzozowski.cpp Brzozowski.h AbstractREtoFAConverter.h
 	$(CXX) $(CXXFLAGS) $< -o $@
+BrzozowskiDerivative.o: BrzozowskiDerivative.cpp BrzozowskiDerivative.h BrzozowskiDerivativeNormalize.h ../../utils/ConversionException.h ../../utils/RegExpUtils.h
+	$(CXX) $(CXXFLAGS) $< -o $@
+
+BrzozowskiDerivativeNormalize.o: BrzozowskiDerivativeNormalize.cpp BrzozowskiDerivativeNormalize.h ../../utils/ConversionException.h
+	$(CXX) $(CXXFLAGS) $< -o $@
+
 Glushkov.o: Glushkov.cpp Glushkov.h AbstractREtoFAConverter.h
 	$(CXX) $(CXXFLAGS) $< -o $@

aconversions/src/conversions/re2fa/are2fa.brzozowski.cpp

@@ -25,7 +25,7 @@ int main(int argc, char** argv)
         RegExp re = RegExpParser::parse(tokens);
         Brzozowski conv( re );
-        conv.convert( ).toXML( cout );
+        conv.convert( );//.toXML( cout );
     }
     catch( AlibException & e )
     {

aconversions/src/utils/RegExpUtils.cpp

@@ -45,4 +45,32 @@ void RegExpUtils::traverseSymbols( RegExpElement * element, list<RegExpSymbol> &
     throw ConversionException( "Captain's log. Stardate 3413.6. Approaching TraverseUtils, class RegExpUtils planet. Encountered invalid RegExpElement. Sending away team to explore." );
 }
+bool RegExpUtils::containsEpsilon( RegExpElement * element )
+{
+    Alternation* alternation = dynamic_cast<Alternation*>( element );
+    Concatenation* concatenation = dynamic_cast<Concatenation*>( element );
+    Iteration* iteration = dynamic_cast<Iteration*>( element );
+    RegExpSymbol* symbol = dynamic_cast<RegExpSymbol*>( element );
+
+    if( alternation )
+    {
+        for( auto e : alternation->getElements( ) )
+            if( containsEpsilon( e ) )
+                return true;
+
+        return false;
+    }
+
+    if( concatenation )
+    {
+        for( auto e : concatenation->getElements( ) )
+            if( ! containsEpsilon( e ) )
+                return false;
+
+        return true;
+    }
+
+    return iteration || ( symbol && *symbol == RegExpSymbol( "" ) );
+}
+
 } /* namespace conversions */

aconversions/src/utils/RegExpUtils.h

@@ -18,6 +18,7 @@ class RegExpUtils
 {
 public:
     static std::list<regexp::RegExpSymbol> getRegExpSymbols( const regexp::RegExp & re );
+    static bool containsEpsilon( regexp::RegExpElement * element );
 private:
     static void traverseSymbols( regexp::RegExpElement * element, std::list<regexp::RegExpSymbol> & alphabet );