diff --git a/DTLib/Experimental/Tester.cs b/DTLib/Experimental/Tester.cs index 6107b6e..8ebd784 100644 --- a/DTLib/Experimental/Tester.cs +++ b/DTLib/Experimental/Tester.cs @@ -12,6 +12,6 @@ public static class Tester operation(); clock.Stop(); double time=(double)(clock.ElapsedTicks)/Stopwatch.Frequency/repeats; - LogNoTime("c",$"operation {op_name} took {time} seconds"); + LogNoTime("y",$"operation ","b",op_name,"y"," took ","b",time.ToString(),"y"," seconds"); } } \ No newline at end of file diff --git a/TestProgram/DtsodC/DictTest.cs b/TestProgram/DtsodC/DictTest.cs index b5a7bef..571e51e 100644 --- a/TestProgram/DtsodC/DictTest.cs +++ b/TestProgram/DtsodC/DictTest.cs @@ -1,4 +1,5 @@ using static DTLib.Experimental.Tester; +using static TestProgram.Program; namespace TestProgram; @@ -16,7 +17,7 @@ static class DictTest } static public void Test(){ - Console.WriteLine("----------------[dict.cs]----------------"); + Info.Log("c","--------------[DictTest]---------------"); Dictionary dict=new(); LogOperationTime("fill",1,()=>Fill(dict)); LogOperationTime("gett",1,()=>Gett(dict)); diff --git a/TestProgram/DtsodV2X/TestDtsodV23.cs b/TestProgram/DtsodV2X/TestDtsodV23.cs index 41e86cf..7b05d23 100644 --- a/TestProgram/DtsodV2X/TestDtsodV23.cs +++ b/TestProgram/DtsodV2X/TestDtsodV23.cs @@ -16,15 +16,15 @@ public static class TestDtsodV23 public static void TestBaseTypes() { - Info.Log("b", "[TestDtsodV23/TestBaseTypes]"); + Info.Log("c", "-----[TestDtsodV23/TestBaseTypes]------"); DtsodV23 dtsod = new(File.ReadAllText($"DtsodV2X{Path.Sep}base_types.dtsod")); foreach (var pair in dtsod) Info.LogNoTime("b", pair.Value.GetType().Name + ' ', "w", pair.Key + ' ', "c", pair.Value.ToString()); - Info.Log("g", "[test completed]"); + Info.Log("g", "test completed"); } public static void TestLists() { - Info.Log("b", "[TestDtsodV23/TestLists]"); + Info.Log("c", "-------[TestDtsodV23/TestLists]--------"); DtsodV23 dtsod = new(File.ReadAllText($"DtsodV2X{Path.Sep}lists.dtsod")); foreach (var pair in dtsod) { @@ -33,12 +33,12 @@ public static class TestDtsodV23 foreach (var el in pair.Value) Info.LogNoTime("b", '\t'+el.GetType().Name + ' ', "c", el.ToString()); } - Info.Log("g", "[test completed]"); + Info.Log("g", "test completed"); } public static void TestComplexes() { - Info.Log("b", "[TestDtsodV23/TestComplexes]"); + Info.Log("c", "-----[TestDtsodV23/TestComplexes]------"); DtsodV23 dtsod = new(File.ReadAllText($"DtsodV2X{Path.Sep}complexes.dtsod")); foreach (var pair in dtsod) { @@ -46,33 +46,33 @@ public static class TestDtsodV23 "b", " length: ", "c", pair.Value.Keys.Count.ToString() + "\n\t", "y", pair.Value.ToString().Replace("\n","\n\t")); } - Info.Log("g", "[test completed]"); + Info.Log("g", "test completed"); } public static void TestReSerialization() { - Info.Log("b", "[TestDtsodV23/TestReSerialization]"); + Info.Log("c", "---[TestDtsodV23/TestReSerialization]--"); DtsodV23 dtsod = new DtsodV23(new DtsodV23(new DtsodV23( new DtsodV23(File.ReadAllText($"DtsodV2X{Path.Sep}complexes.dtsod")).ToString()).ToString()).ToString()); Info.Log("y", dtsod.ToString()); - Info.Log("g", "[test completed]"); + Info.Log("g", "test completed"); } public static void TestSpeed() { - Info.Log("b", "[TestDtsodV23/TestSpeed]"); + Info.Log("c", "--------[TestDtsodV23/TestSpeed]-------"); IDtsod dtsod=null; string text = File.ReadAllText($"DtsodV2X{Path.Sep}messages.dtsod"); Tester.LogOperationTime("V21 deserialization",100,()=>dtsod=new DtsodV21(text)); Tester.LogOperationTime("V21 serialization", 100, () => _=dtsod.ToString()); Tester.LogOperationTime("V23 deserialization", 100, () => dtsod = new DtsodV23(text)); Tester.LogOperationTime("V23 serialization", 100, () => _ = dtsod.ToString()); - Info.Log("g", "[test completed]"); + Info.Log("g", "test completed"); } public static void TestMemoryConsumption() { - Info.Log("b", "[TestDtsodV23/TestMemoryConsumption]"); + Info.Log("c", "-----[TestDtsodV23/TestMemConsumpt]----"); string text = File.ReadAllText($"DtsodV2X{Path.Sep}messages.dtsod"); var a = GC.GetTotalMemory(true); DtsodV23[] dtsods = new DtsodV23[100]; @@ -81,6 +81,6 @@ public static class TestDtsodV23 var b = GC.GetTotalMemory(true); Info.Log("b", "at the start: ","c",$"{a/1024} kb\n", "b", "at the end: ", "c", $"{b / 1024} kb\n{dtsods.Count()}","b"," dtsods initialized"); - Info.Log("g", "[test completed]"); + Info.Log("g", "test completed"); } } diff --git a/TestProgram/Program.cs b/TestProgram/Program.cs index 0124e0e..a08d3e6 100644 --- a/TestProgram/Program.cs +++ b/TestProgram/Program.cs @@ -29,7 +29,7 @@ static class Program Console.Title="tester"; try { - Info.Log("g","-------[DTLib tester]-------"); + Info.Log("c", "-------------[TestProgram]-------------"); //TestDtsodV23.TestAll(); DictTest.Test(); }