Natools

Diff
Login

Differences From Artifact [aba30e7eed]:

To Artifact [42bdaafbcb]:


35
36
37
38
39
40
41


42
43
44
45
46
47
48
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50







+
+







   procedure Generic_Roundtrip_Test
     (Test : in out NT.Test;
      Dict : in Smaz.Dictionary;
      Decompressed : in String;
      Compressed : in Ada.Streams.Stream_Element_Array);

   function Decimal_Image (S : Ada.Streams.Stream_Element_Array) return String;

   function Dictionary_256_Without_VLV return Smaz_256.Dictionary;

   function Dictionary_4096 (Variable_Length_Verbatim : in Boolean)
     return Natools.Smaz_4096.Dictionary;

   function Dictionary_4096_Hash (S : in String) return Natural;

   function Direct_Image (S : Ada.Streams.Stream_Element_Array) return String
119
120
121
122
123
124
125








126
127
128
129
130
131
132
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142







+
+
+
+
+
+
+
+







      for I in S'Range loop
         Append (Result, Ada.Streams.Stream_Element'Image (S (I)));
      end loop;

      return To_String (Result);
   end Decimal_Image;


   function Dictionary_256_Without_VLV return Smaz_256.Dictionary is
   begin
      return Dict : Smaz_256.Dictionary := Smaz_Original.Dictionary do
         Dict.Variable_Length_Verbatim := False;
      end return;
   end Dictionary_256_Without_VLV;


   function Dictionary_4096 (Variable_Length_Verbatim : in Boolean)
     return Natools.Smaz_4096.Dictionary
   is
      subtype Letter_Rank is Natural range 1 .. 26;
      function Lower (N : Letter_Rank) return Character
        is (Character'Val (Character'Pos ('a') - 1 + N));
441
442
443
444
445
446
447

448
449
450
451
452
453
454
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465







+







   ------------------------------
   -- Test Suite for Each Base --
   ------------------------------

   procedure All_Tests_256 (Report : in out NT.Reporter'Class) is
   begin
      Test_Validity_256 (Report);
      Sample_Strings_256 (Report);
      Sample_Strings_VLV_256 (Report);
   end All_Tests_256;


   procedure All_Tests_4096 (Report : in out NT.Reporter'Class) is
   begin
      declare
479
480
481
482
483
484
485













































486
487
488
489
490
491
492
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548







+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+







   end All_Tests_64;



   -------------------------------
   -- Individual Base-256 Tests --
   -------------------------------

   procedure Sample_Strings_256 (Report : in out NT.Reporter'Class) is
      Test : NT.Test
        := Report.Item ("Roundtrip on sample strings without VLV");
      Dict : constant Smaz_256.Dictionary := Dictionary_256_Without_VLV;
   begin
      Roundtrip_Test (Test, Dict,
         "This is a small string",
         (255, 84, 76, 56, 172, 62, 173, 152, 62, 195, 70));
      Roundtrip_Test (Test, Dict,
         "foobar",
         (220, 6, 90, 79));
      Roundtrip_Test (Test, Dict,
         "the end",
         (1, 171, 61));
      Roundtrip_Test (Test, Dict,
         "not-a-g00d-Exampl333",
         (132, 204, 4, 204, 59, 254, 48, 48, 24, 204, 255, 69, 250, 4, 45,
           60, 22, 254, 51, 51, 255, 51));
      Roundtrip_Test (Test, Dict,
         "Smaz is a simple compression library",
         (255, 83, 173, 219, 56, 172, 62, 226, 60, 87, 161, 45, 60, 33, 166,
           107, 205, 8, 90, 130, 12, 83));
      Roundtrip_Test (Test, Dict,
         "Nothing is more difficult, and therefore more precious, "
           & "than to be able to decide",
         (255, 78, 223, 102, 99, 116, 45, 42, 11, 129, 44, 44, 131, 38, 22, 3,
           148, 63, 210, 68, 11, 45, 42, 11, 60, 33, 28, 144, 164, 36, 203,
           143, 96, 92, 25, 90, 87, 82, 165, 215, 237, 2));
      Roundtrip_Test (Test, Dict,
         "this is an example of what works very well with smaz",
         (155, 56, 172, 41, 2, 250, 4, 45, 60, 87, 32, 159, 135, 65, 42, 255,
           107, 23, 231, 71, 145, 152, 243, 227, 10, 173, 219));
      Roundtrip_Test (Test, Dict,
         "1000 numbers 2000 will 10 20 30 compress very little",
         (254, 49, 48, 254, 48, 48, 236, 38, 45, 92, 221, 0, 254, 50, 48,
           254, 48, 48, 243, 152, 0, 254, 49, 48, 0, 254, 50, 48, 0, 254, 51,
           48, 161, 45, 60, 33, 166, 0, 231, 71, 151, 3, 3, 87));
      Roundtrip_Test (Test, Dict,
         ": : : :",
         (254, 58, 32, 254, 58, 32, 254, 58, 32, 255, 58));
   exception
      when Error : others => Test.Report_Exception (Error);
   end Sample_Strings_256;


   procedure Sample_Strings_VLV_256 (Report : in out NT.Reporter'Class) is
      Test : NT.Test := Report.Item
        ("Roundtrip on sample strings with variable-length verbatim");
   begin
      Roundtrip_Test (Test, Smaz_Original.Dictionary,
         "This is a small string",