Adding commands to generate data for experiments.

6 files changed, 74 insertions, 6 deletions

diff --git a/abcexe.dsp b/abcexe.dsp
index 9d5152fc..68a5e6d4 100644
--- a/abcexe.dsp
+++ b/abcexe.dsp
@@ -88,6 +88,10 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
+SOURCE=.\src\base\abci\abc.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\base\main\main.c
 # End Source File
 # End Group
diff --git a/abclib.dsp b/abclib.dsp
index 90190563..14220199 100644
--- a/abclib.dsp
+++ b/abclib.dsp
@@ -5039,6 +5039,10 @@ SOURCE=.\src\aig\gia\giaSim4.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\aig\gia\giaSim5.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\aig\gia\giaSimBase.c
 # End Source File
 # Begin Source File
diff --git a/src/aig/gia/giaGen.c b/src/aig/gia/giaGen.c
index 007a74f9..09a859ad 100644
--- a/src/aig/gia/giaGen.c
+++ b/src/aig/gia/giaGen.c
@@ -156,10 +156,10 @@ void Gia_ManDumpFiles( Gia_Man_t * p, int nCexesT, int nCexesV, int Seed, char *
     char pFileNameOutVX[100];
     char pFileNameOutVY[100];
     
-    sprintf( pFileNameOutTX, "data/train_%s_%d_%d.data", pFileName ? pFileName : Gia_ManName(p), nSize[0], Gia_ManCiNum(p) );
-    sprintf( pFileNameOutTY, "data/train_%s_%d_%d.data", pFileName ? pFileName : Gia_ManName(p), nSize[0], Gia_ManCoNum(p) );
-    sprintf( pFileNameOutVX, "data/test_%s_%d_%d.data",  pFileName ? pFileName : Gia_ManName(p), nSize[1], Gia_ManCiNum(p) );
-    sprintf( pFileNameOutVY, "data/test_%s_%d_%d.data",  pFileName ? pFileName : Gia_ManName(p), nSize[1], Gia_ManCoNum(p) );
+    sprintf( pFileNameOutTX, "train_%s_%d_%d.data", pFileName ? pFileName : Gia_ManName(p), nSize[0], Gia_ManCiNum(p) );
+    sprintf( pFileNameOutTY, "train_%s_%d_%d.data", pFileName ? pFileName : Gia_ManName(p), nSize[0], Gia_ManCoNum(p) );
+    sprintf( pFileNameOutVX, "test_%s_%d_%d.data",  pFileName ? pFileName : Gia_ManName(p), nSize[1], Gia_ManCiNum(p) );
+    sprintf( pFileNameOutVY, "test_%s_%d_%d.data",  pFileName ? pFileName : Gia_ManName(p), nSize[1], Gia_ManCoNum(p) );
 
     Gia_ManRandomW( 1 );
     for ( n = 0; n < Seed; n++ )
@@ -241,8 +241,8 @@ void Gia_ManDumpPlaFiles( Gia_Man_t * p, int nCexesT, int nCexesV, int Seed, cha
     char pFileNameOutT[100];
     char pFileNameOutV[100];
     
-    sprintf( pFileNameOutT, "data/train_%s_%d.pla", pFileName ? pFileName : Gia_ManName(p), nSize[0], Gia_ManCiNum(p) );
-    sprintf( pFileNameOutV, "data/test_%s_%d.pla",  pFileName ? pFileName : Gia_ManName(p), nSize[1], Gia_ManCiNum(p) );
+    sprintf( pFileNameOutT, "train_%s_%d.pla", pFileName ? pFileName : Gia_ManName(p), nSize[0], Gia_ManCiNum(p) );
+    sprintf( pFileNameOutV, "test_%s_%d.pla",  pFileName ? pFileName : Gia_ManName(p), nSize[1], Gia_ManCiNum(p) );
 
     Gia_ManRandomW( 1 );
     for ( n = 0; n < Seed; n++ )
diff --git a/src/aig/gia/giaSim5.c b/src/aig/gia/giaSim5.c
new file mode 100644
index 00000000..bdfd78b4
--- /dev/null
+++ b/src/aig/gia/giaSim5.c
@@ -0,0 +1,55 @@
+/**CFile****************************************************************
+
+  FileName    [giaSim5.c]
+
+  SystemName  [ABC: Logic synthesis and verification system.]
+
+  PackageName [Scalable AIG package.]
+
+  Synopsis    [Simulation engine.]
+
+  Author      [Alan Mishchenko]
+  
+  Affiliation [UC Berkeley]
+
+  Date        [Ver. 1.0. Started - June 20, 2005.]
+
+  Revision    [$Id: giaSim5.c,v 1.00 2005/06/20 00:00:00 alanmi Exp $]
+
+***********************************************************************/
+
+#include "gia.h"
+#include "base/main/main.h"
+
+ABC_NAMESPACE_IMPL_START
+
+////////////////////////////////////////////////////////////////////////
+///                        DECLARATIONS                              ///
+////////////////////////////////////////////////////////////////////////
+
+void Sim_Init( Abc_Frame_t * pAbc ) {}
+void Sim_End( Abc_Frame_t * pAbc )  {}
+
+////////////////////////////////////////////////////////////////////////
+///                     FUNCTION DEFINITIONS                         ///
+////////////////////////////////////////////////////////////////////////
+
+/**Function*************************************************************
+
+  Synopsis    []
+
+  Description []
+
+  SideEffects []
+
+  SeeAlso     []
+
+***********************************************************************/
+
+////////////////////////////////////////////////////////////////////////
+///                       END OF FILE                                ///
+////////////////////////////////////////////////////////////////////////
+
+
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/aig/gia/module.make b/src/aig/gia/module.make
index 49e48392..26909410 100644
--- a/src/aig/gia/module.make
+++ b/src/aig/gia/module.make
@@ -76,6 +76,7 @@ SRC +=    src/aig/gia/giaAig.c \
     src/aig/gia/giaSim.c \
     src/aig/gia/giaSim2.c \
     src/aig/gia/giaSim4.c \
+    src/aig/gia/giaSim5.c \
     src/aig/gia/giaSimBase.c \
     src/aig/gia/giaSort.c \
     src/aig/gia/giaSpeedup.c \
diff --git a/src/base/main/mainInit.c b/src/base/main/mainInit.c
index 7f5f13a8..d85d7b67 100644
--- a/src/base/main/mainInit.c
+++ b/src/base/main/mainInit.c
@@ -55,6 +55,8 @@ extern void Cba_Init( Abc_Frame_t * pAbc );
 extern void Cba_End( Abc_Frame_t * pAbc );
 extern void Pla_Init( Abc_Frame_t * pAbc );
 extern void Pla_End( Abc_Frame_t * pAbc );
+extern void Sim_Init( Abc_Frame_t * pAbc );
+extern void Sim_End( Abc_Frame_t * pAbc );
 extern void Test_Init( Abc_Frame_t * pAbc );
 extern void Test_End( Abc_Frame_t * pAbc );
 extern void Abc2_Init( Abc_Frame_t * pAbc );
@@ -115,6 +117,7 @@ void Abc_FrameInit( Abc_Frame_t * pAbc )
     Bac_Init( pAbc );
     Cba_Init( pAbc );
     Pla_Init( pAbc );
+    Sim_Init( pAbc );
     Test_Init( pAbc );
     Glucose_Init( pAbc );
     for( p = s_InitializerStart ; p ; p = p->next )
@@ -154,6 +157,7 @@ void Abc_FrameEnd( Abc_Frame_t * pAbc )
     Bac_End( pAbc );
     Cba_End( pAbc );
     Pla_End( pAbc );
+    Sim_End( pAbc );
     Test_End( pAbc );
     Glucose_End( pAbc );
 }