generalized the various implementation

Author: eeshan9815

perf/linear_eq.jl

@@ -18,23 +18,25 @@ end
 
 function benchmark(max=10)
     df = DataFrame()
-    df[:Method] = ["Array", "MArray", "SArray1", "SArray2", "Contractor"]
+    df[:Method] = ["Array", "MArray", "SArray", "Contractor", "ContractorMArray", "ContractorSArray"]
     for n in 1:max
         A, mA, sA = randMat(n)
         b, mb, sb = randVec(n)
         t1 = @belapsed gauss_seidel_interval($A, $b)
-        t2 = @belapsed gauss_seidel_interval_static($mA, $mb)
-        t3 = @belapsed gauss_seidel_interval_static1($sA, $sb)
-        t4 = @belapsed gauss_seidel_interval_static2($sA, $sb)
-        t5 = @belapsed gauss_seidel_contractor($A, $b)
-        df[Symbol("n = $n")] = [t1, t2, t3, t4, t5]
+        t2 = @belapsed gauss_seidel_interval($mA, $mb)
+        t3 = @belapsed gauss_seidel_interval($sA, $sb)
+        t4 = @belapsed gauss_seidel_contractor($A, $b)
+        t5 = @belapsed gauss_seidel_contractor($mA, $mb)
+        t6 = @belapsed gauss_seidel_contractor($sA, $sb)
+        df[Symbol("$n")] = [t1, t2, t3, t4, t5, t6]
     end
     a = []
     for i in 1:max
-        push!(a, Symbol("n = $i"))
+        push!(a, Symbol("$i"))
     end
     df1 = stack(df, a)
     dfnew = unstack(df1, :variable, :Method, :value)
+    dfnew = rename(dfnew, :variable => :n)
     println(dfnew)
     dfnew
 end

perf/linear_eq_tabular.txt

@@ -20,3 +20,17 @@
 │ 18  │ n = 18   │ 0.00167176  │ 0.00159463  │ 0.043795    │ 0.00181409  │ 0.00162584  │
 │ 19  │ n = 19   │ 0.0018632   │ 0.00185617  │ 0.0549107   │ 0.00208529  │ 0.00196587  │
 │ 20  │ n = 20   │ 0.0020604   │ 0.00210595  │ 0.0635598   │ 0.00232704  │ 0.00212374  │
+
+10×7 DataFrames.DataFrame
+│ Row │ n  │ Array       │ Contractor  │ ContractorMArray │ ContractorSArray │ MArray      │ SArray      │
+├─────┼────┼─────────────┼─────────────┼──────────────────┼──────────────────┼─────────────┼─────────────┤
+│ 1   │ 1  │ 1.0188e-5   │ 2.5276e-5   │ 0.000781355      │ 0.000764627      │ 1.6959e-5   │ 1.1216e-5   │
+│ 2   │ 10 │ 0.000377853 │ 0.000407817 │ 0.00122723       │ 0.00123259       │ 0.0029247   │ 0.000393896 │
+│ 3   │ 2  │ 2.609e-5    │ 4.3597e-5   │ 0.000802467      │ 0.000796962      │ 4.1039e-5   │ 2.6654e-5   │
+│ 4   │ 3  │ 4.7362e-5   │ 6.317e-5    │ 0.000832029      │ 0.000821289      │ 9.1695e-5   │ 4.7007e-5   │
+│ 5   │ 4  │ 7.0378e-5   │ 9.1502e-5   │ 0.00085429       │ 0.000844048      │ 0.000163604 │ 7.1166e-5   │
+│ 6   │ 5  │ 0.000104813 │ 0.000129112 │ 0.000898626      │ 0.000889969      │ 0.000268756 │ 0.000112476 │
+│ 7   │ 6  │ 0.000142316 │ 0.000168891 │ 0.000941422      │ 0.000922727      │ 0.000430442 │ 0.000146906 │
+│ 8   │ 7  │ 0.000192073 │ 0.000218861 │ 0.00108794       │ 0.000997821      │ 0.00073304  │ 0.000198962 │
+│ 9   │ 8  │ 0.000242832 │ 0.000273341 │ 0.00107159       │ 0.00106769       │ 0.00126407  │ 0.000250956 │
+│ 10  │ 9  │ 0.000308256 │ 0.000333722 │ 0.00116203       │ 0.00116428       │ 0.00196451  │ 0.000314499 │

src/IntervalRootFinding.jl

@@ -21,8 +21,10 @@ export
     bisect, newton1d, slope,
     slope_newton1d,
     gauss_seidel_interval, gauss_seidel_interval!,
-    gauss_seidel_contractor, gauss_seidel_contractor!,
-    gauss_seidel_interval_static1, gauss_seidel_interval_static1!
+    gauss_seidel_contractor, gauss_seidel_contractor!
+    # gauss_seidel_interval_static1, gauss_seidel_interval_static1!
+    # gauss_seidel_interval_static2, gauss_seidel_interval_static2!
+    # gauss_seidel_interval_static, gauss_seidel_interval_static!
 
 export isunique, root_status