Merge pull request #339 from GraphBLAS/v1.2

V1.2: cleanup for FastAssign, test for SwapEdges

Author: DrTimothyAldenDavis

experimental/test/test_SwapEdges.c

@@ -123,6 +123,8 @@ void test_SwapEdges (void)
             //------------------------------------------------------------------
             // check results
             //------------------------------------------------------------------
+            // Check sufficient swaps were performed.
+            TEST_CHECK (pQ >= 100.0) ;
             //Make sure we got a symetric back out:
             OK (LAGraph_CheckGraph (G_new, msg)) ;
 
@@ -305,6 +307,8 @@ void test_SwapEdges_brutal (void)
         //------------------------------------------------------------------
         // check results
         //------------------------------------------------------------------
+        // Check sufficient swaps were performed.
+        TEST_CHECK (pQ >= 1.0) ;
         //Make sure we got a symetric back out:
         LG_BRUTAL_BURBLE (LAGraph_CheckGraph (G_new, msg)) ;
 

experimental/utility/LAGraph_FastAssign.c

@@ -161,8 +161,7 @@ int LAGraph_FastAssign_Semiring
     void *ramp_a = NULL, *i_a =NULL;
     int ramp_h = GrB_DEFAULT, trsp = GrB_DEFAULT, i_h = GrB_DEFAULT;
     uint64_t ramp_n = 0, ramp_size = 0, i_n = 0, i_size= 0;
-    GrB_Type x_type = NULL, i_type = NULL, ramp_type = NULL;
-    int32_t iso = false;
+    GrB_Type i_type = NULL, ramp_type = NULL;
     //----------------------------------------------------------------------
     // Check inputs
     //----------------------------------------------------------------------
@@ -191,10 +190,6 @@ int LAGraph_FastAssign_Semiring
         GRB_TRY (GrB_Vector_size(&nrows, c)) ;
     }
 
-    GRB_TRY (GrB_Vector_get_INT32(X_vec, &iso, GxB_ISO)) ;
-
-    GRB_TRY (GxB_Vector_type(&x_type, X_vec));
-
     //----------------------------------------------------------------------
     // Load up containers
     //----------------------------------------------------------------------