1 files changed, 106 insertions, 14 deletions

diff --git a/src/opt/cut/cutList.h b/src/opt/cut/cutList.h
index eb008ef9..a03ec9d5 100644
--- a/src/opt/cut/cutList.h
+++ b/src/opt/cut/cutList.h
@@ -36,12 +36,12 @@
 typedef struct Cut_ListStruct_t_         Cut_List_t;
 struct Cut_ListStruct_t_
 {
-    Cut_Cut_t *  pHead[7];
-    Cut_Cut_t ** ppTail[7];
+    Cut_Cut_t *  pHead[CUT_SIZE_MAX+1];
+    Cut_Cut_t ** ppTail[CUT_SIZE_MAX+1];
 };
 
 ////////////////////////////////////////////////////////////////////////
-///                      MACRO DEFITIONS                             ///
+///                      MACRO DEFINITIONS                           ///
 ////////////////////////////////////////////////////////////////////////
 
 ////////////////////////////////////////////////////////////////////////
@@ -50,7 +50,7 @@ struct Cut_ListStruct_t_
 
 /**Function*************************************************************
 
-  Synopsis    []
+  Synopsis    [Start the cut list.]
 
   Description []
                
@@ -62,7 +62,7 @@ struct Cut_ListStruct_t_
 static inline void Cut_ListStart( Cut_List_t * p )
 {
     int i;
-    for ( i = 1; i <= 6; i++ )
+    for ( i = 1; i <= CUT_SIZE_MAX; i++ )
     {
         p->pHead[i] = 0;
         p->ppTail[i] = &p->pHead[i];
@@ -71,7 +71,7 @@ static inline void Cut_ListStart( Cut_List_t * p )
 
 /**Function*************************************************************
 
-  Synopsis    []
+  Synopsis    [Adds one cut to the cut list.]
 
   Description []
                
@@ -82,14 +82,100 @@ static inline void Cut_ListStart( Cut_List_t * p )
 ***********************************************************************/
 static inline void Cut_ListAdd( Cut_List_t * p, Cut_Cut_t * pCut )
 {
-    assert( pCut->nLeaves > 0 && pCut->nLeaves < 7 );
+    assert( pCut->nLeaves > 0 && pCut->nLeaves <= CUT_SIZE_MAX );
     *p->ppTail[pCut->nLeaves] = pCut;
     p->ppTail[pCut->nLeaves] = &pCut->pNext;
 }
 
 /**Function*************************************************************
 
-  Synopsis    []
+  Synopsis    [Adds one cut to the cut list while preserving order.]
+
+  Description []
+               
+  SideEffects []
+
+  SeeAlso     []
+
+***********************************************************************/
+static inline void Cut_ListAdd2( Cut_List_t * p, Cut_Cut_t * pCut )
+{
+    extern int Cut_CutCompare( Cut_Cut_t * pCut1, Cut_Cut_t * pCut2 );
+    Cut_Cut_t * pTemp, ** ppSpot;
+    assert( pCut->nLeaves > 0 && pCut->nLeaves <= CUT_SIZE_MAX );
+    if ( p->pHead[pCut->nLeaves] != NULL )
+    {
+        ppSpot = &p->pHead[pCut->nLeaves];
+        for ( pTemp = p->pHead[pCut->nLeaves]; pTemp; pTemp = pTemp->pNext )
+        {
+            if ( Cut_CutCompare(pCut, pTemp) < 0 )
+            {
+                *ppSpot = pCut;
+                pCut->pNext = pTemp;
+                return;
+            }
+            else
+                ppSpot = &pTemp->pNext;
+        }
+    }
+    *p->ppTail[pCut->nLeaves] = pCut;
+    p->ppTail[pCut->nLeaves] = &pCut->pNext;
+}
+
+/**Function*************************************************************
+
+  Synopsis    [Derive the super list from the linked list of cuts.]
+
+  Description []
+               
+  SideEffects []
+
+  SeeAlso     []
+
+***********************************************************************/
+static inline void Cut_ListDerive( Cut_List_t * p, Cut_Cut_t * pList )
+{
+    Cut_Cut_t * pPrev;
+    int nLeaves;
+    Cut_ListStart( p );
+    while ( pList != NULL )
+    {
+        nLeaves = pList->nLeaves;
+        p->pHead[nLeaves] = pList;
+        for ( pPrev = pList, pList = pList->pNext; pList; pPrev = pList, pList = pList->pNext )
+            if ( nLeaves < (int)pList->nLeaves )
+                break;
+        p->ppTail[nLeaves] = &pPrev->pNext;
+        pPrev->pNext = NULL;
+    }
+}
+
+/**Function*************************************************************
+
+  Synopsis    [Adds the second list to the first list.]
+
+  Description []
+               
+  SideEffects []
+
+  SeeAlso     []
+
+***********************************************************************/
+static inline void Cut_ListAddList( Cut_List_t * pOld, Cut_List_t * pNew )
+{
+    int i;
+    for ( i = 1; i <= CUT_SIZE_MAX; i++ )
+    {
+        if ( pNew->pHead[i] == NULL )
+            continue;
+        *pOld->ppTail[i] = pNew->pHead[i];
+        pOld->ppTail[i] = pNew->ppTail[i];
+    }
+}
+
+/**Function*************************************************************
+
+  Synopsis    [Returns the cut list linked into one sequence of cuts.]
 
   Description []
                
@@ -100,16 +186,22 @@ static inline void Cut_ListAdd( Cut_List_t * p, Cut_Cut_t * pCut )
 ***********************************************************************/
 static inline Cut_Cut_t * Cut_ListFinish( Cut_List_t * p )
 {
+    Cut_Cut_t * pHead = NULL, ** ppTail = &pHead;
     int i;
-    for ( i = 1; i < 6; i++ )
-        *p->ppTail[i] = p->pHead[i+1];
-    *p->ppTail[6] = NULL;
-    return p->pHead[1];
+    for ( i = 1; i <= CUT_SIZE_MAX; i++ )
+    {
+        if ( p->pHead[i] == NULL )
+            continue;
+        *ppTail = p->pHead[i];
+        ppTail = p->ppTail[i];
+    }
+    *ppTail = NULL;
+    return pHead;
 }
 
+#endif
+
 ////////////////////////////////////////////////////////////////////////
 ///                       END OF FILE                                ///
 ////////////////////////////////////////////////////////////////////////
 
-#endif
-