diff options
| -rw-r--r-- | po/PriorityLists.pot | 144 | ||||
| -rw-r--r-- | po/cat-id-tbl.c | 147 | ||||
| -rw-r--r-- | po/de.po | 186 | ||||
| -rw-r--r-- | po/fr.po | 223 | ||||
| -rw-r--r-- | src/main.cc | 3 | ||||
| -rw-r--r-- | src/test.cc | 68 |
6 files changed, 480 insertions, 291 deletions
diff --git a/po/PriorityLists.pot b/po/PriorityLists.pot index 4f5f857..820727b 100644 --- a/po/PriorityLists.pot +++ b/po/PriorityLists.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-03-07 01:38+0100\n" +"POT-Creation-Date: 2001-03-07 01:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -14,242 +14,246 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: src/test.cc:33 +#: src/main.cc:35 src/main.cc:175 src/test.cc:37 src/test.cc:166 +msgid "Unknow priority list type: " +msgstr "" + +#: src/test.cc:49 msgid "Creation of a priority list and adding " msgstr "" -#: src/test.cc:33 +#: src/test.cc:49 msgid " random entrie(s)..." msgstr "" -#: src/test.cc:40 +#: src/test.cc:56 msgid "" "Ok.\n" "Deleting the list..." msgstr "" -#: src/test.cc:44 src/test.cc:48 +#: src/test.cc:60 src/test.cc:64 msgid "List has " msgstr "" -#: src/test.cc:44 +#: src/test.cc:60 msgid " keys. Expecting " msgstr "" -#: src/test.cc:45 src/test.cc:49 +#: src/test.cc:61 src/test.cc:65 msgid "List corrupted." msgstr "" -#: src/test.cc:48 +#: src/test.cc:64 msgid " keys (real count). Expecting " msgstr "" -#: src/test.cc:53 src/test.cc:128 +#: src/test.cc:69 src/test.cc:146 msgid "Incorrect order." msgstr "" -#: src/test.cc:68 +#: src/test.cc:84 msgid "Size of a PriorityList cell: " msgstr "" -#: src/test.cc:69 +#: src/test.cc:85 msgid "Size of a BHeap cell : " msgstr "" -#: src/test.cc:70 +#: src/test.cc:86 msgid "Size of a FHeap cell : " msgstr "" -#: src/test.cc:71 +#: src/test.cc:87 msgid "Size of a PLList header : " msgstr "" -#: src/test.cc:72 +#: src/test.cc:88 msgid "Size of a CList cell : " msgstr "" -#: src/test.cc:73 +#: src/test.cc:89 msgid "Size of a SList cell : " msgstr "" -#: src/test.cc:74 +#: src/test.cc:90 msgid "Size of a BinHeap header : " msgstr "" -#: src/test.cc:75 +#: src/test.cc:91 msgid "Size of a BinHeap cell : " msgstr "" -#: src/test.cc:89 +#: src/test.cc:105 msgid "Creating a priority list and adding keys:\n" msgstr "" -#: src/test.cc:104 src/test.cc:111 src/test.cc:115 src/test.cc:119 +#: src/test.cc:122 src/test.cc:129 src/test.cc:133 src/test.cc:137 msgid "" "Ok.\n" "List browsing...\n" msgstr "" -#: src/test.cc:106 +#: src/test.cc:124 msgid "" "Ok.\n" "Extract_Min + List browsing...\n" msgstr "" -#: src/test.cc:109 +#: src/test.cc:127 msgid "" "Ok.\n" "Lower_Key(0) over 59...\n" msgstr "" -#: src/test.cc:113 +#: src/test.cc:131 msgid "" "Ok.\n" "Delete over 54...\n" msgstr "" -#: src/test.cc:117 +#: src/test.cc:135 msgid "" "Ok.\n" "Lower_Key(-12) over 30...\n" msgstr "" -#: src/test.cc:121 +#: src/test.cc:139 msgid "" "Ok.\n" "Extract_Min...\n" msgstr "" -#: src/test.cc:123 +#: src/test.cc:141 msgid "" "Ok.\n" "Extracting datas...\n" msgstr "" -#: src/test.cc:125 +#: src/test.cc:143 msgid "Minimum #" msgstr "" -#: src/test.cc:131 +#: src/test.cc:149 msgid "" "Ok.\n" "\n" "All the tests were successfull\n" msgstr "" -#: src/main.cc:35 src/main.cc:174 -msgid "Unknow priority list type: " +#: src/test.cc:155 +msgid "Usage: testTas [type]\n" +msgstr "" + +#: src/main.cc:179 src/test.cc:170 +msgid "Extra command: " msgstr "" -#: src/main.cc:46 src/main.cc:72 +#: src/main.cc:46 src/main.cc:73 msgid "Error opening file (" msgstr "" -#: src/main.cc:78 +#: src/main.cc:79 msgid "Bad dictionnary structure. See doc/README.en (missing : separator)" msgstr "" -#: src/main.cc:91 +#: src/main.cc:92 msgid "Bad dictionnary structure. See doc/README.en (missing word)" msgstr "" -#: src/main.cc:102 +#: src/main.cc:103 msgid "Bad dictionnary structure. See doc/README.en (missing frequency)" msgstr "" -#: src/main.cc:107 +#: src/main.cc:108 msgid "Error: \"" msgstr "" -#: src/main.cc:107 +#: src/main.cc:108 msgid "\" is not a valid number." msgstr "" -#: src/main.cc:116 +#: src/main.cc:117 msgid "Huffman [{-f|-i} file] {type}" msgstr "" -#: src/main.cc:117 +#: src/main.cc:118 msgid "Huffman -h" msgstr "" -#: src/main.cc:118 +#: src/main.cc:119 msgid "By Nicolas Noble (nicolas@nobis-crew.org)." msgstr "" -#: src/main.cc:119 +#: src/main.cc:120 msgid "This will encode the input file with the Huffman code" msgstr "" -#: src/main.cc:120 +#: src/main.cc:121 msgid "using the priority list defined by type." msgstr "" -#: src/main.cc:121 +#: src/main.cc:122 msgid "Type is a number taken from this list:" msgstr "" -#: src/main.cc:122 +#: src/main.cc:123 msgid " 0 : Binary Heap (default)" msgstr "" -#: src/main.cc:123 +#: src/main.cc:124 msgid " 1 : Binomial Heap" msgstr "" -#: src/main.cc:124 -msgid " 2 : Fibbonacci Heap (bugged)" +#: src/main.cc:125 +msgid " 2 : Fibonacci Heap" msgstr "" -#: src/main.cc:125 +#: src/main.cc:126 msgid " 3 : Sorted chained list" msgstr "" -#: src/main.cc:126 +#: src/main.cc:127 msgid "-f file means that you specify a dictionnary file which is" msgstr "" -#: src/main.cc:127 +#: src/main.cc:128 msgid " structured as described into the README file." msgstr "" -#: src/main.cc:128 +#: src/main.cc:129 msgid "-i file means that you specify a file to encode. It will" msgstr "" -#: src/main.cc:129 +#: src/main.cc:130 msgid " built a quiet dumb dictionnary." msgstr "" -#: src/main.cc:130 +#: src/main.cc:131 msgid "By default, a dictionnary will be built from stdin." msgstr "" -#: src/main.cc:131 +#: src/main.cc:132 msgid "-h prints this help and exit." msgstr "" -#: src/main.cc:146 +#: src/main.cc:147 msgid "Unknow option: " msgstr "" -#: src/main.cc:155 src/main.cc:164 +#: src/main.cc:156 src/main.cc:165 msgid "-i and -f options are exclusive" msgstr "" -#: src/main.cc:178 -msgid "Extra command: " -msgstr "" - -#: src/main.cc:193 +#: src/main.cc:195 msgid "-i needs a filename" msgstr "" -#: src/main.cc:198 +#: src/main.cc:200 msgid "-f needs a filename" msgstr "" -#: src/main.cc:202 +#: src/main.cc:204 msgid "Internal error." msgstr "" @@ -289,38 +293,38 @@ msgid "" " |\n" msgstr "" -#: lib/HTree.cc:79 +#: lib/HTree.cc:82 msgid "Bitstream length : " msgstr "" -#: lib/HTree.cc:79 lib/HTree.cc:82 lib/HTree.cc:84 lib/HTree.cc:85 +#: lib/HTree.cc:82 lib/HTree.cc:85 lib/HTree.cc:87 lib/HTree.cc:88 msgid " bits (= " msgstr "" -#: lib/HTree.cc:81 lib/HTree.cc:82 lib/HTree.cc:84 lib/HTree.cc:89 +#: lib/HTree.cc:84 lib/HTree.cc:85 lib/HTree.cc:87 lib/HTree.cc:92 msgid " bytes)\n" msgstr "" -#: lib/HTree.cc:82 +#: lib/HTree.cc:85 msgid "Real size input : " msgstr "" -#: lib/HTree.cc:83 +#: lib/HTree.cc:86 msgid "Size squeezed by : " msgstr "" -#: lib/HTree.cc:83 lib/HTree.cc:91 +#: lib/HTree.cc:86 lib/HTree.cc:94 msgid " percents\n" msgstr "" -#: lib/HTree.cc:84 +#: lib/HTree.cc:87 msgid "Dictionnary size : " msgstr "" -#: lib/HTree.cc:85 +#: lib/HTree.cc:88 msgid "Total bitstream length : " msgstr "" -#: lib/HTree.cc:90 +#: lib/HTree.cc:93 msgid "Real gain (4 bytes header) : " msgstr "" diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c index 98d3bf4..c911baa 100644 --- a/po/cat-id-tbl.c +++ b/po/cat-id-tbl.c @@ -8,101 +8,102 @@ const struct _msg_ent _msg_tbl[] = { {"", 1}, - {"Creation of a priority list and adding ", 2}, - {" random entrie(s)...", 3}, + {"Unknow priority list type: ", 2}, + {"Creation of a priority list and adding ", 3}, + {" random entrie(s)...", 4}, {"\ Ok.\n\ -Deleting the list...", 4}, - {"List has ", 5}, - {" keys. Expecting ", 6}, - {"List corrupted.", 7}, - {" keys (real count). Expecting ", 8}, - {"Incorrect order.", 9}, - {"Size of a PriorityList cell: ", 10}, - {"Size of a BHeap cell : ", 11}, - {"Size of a FHeap cell : ", 12}, - {"Size of a PLList header : ", 13}, - {"Size of a CList cell : ", 14}, - {"Size of a SList cell : ", 15}, - {"Size of a BinHeap header : ", 16}, - {"Size of a BinHeap cell : ", 17}, - {"Creating a priority list and adding keys:\n", 18}, +Deleting the list...", 5}, + {"List has ", 6}, + {" keys. Expecting ", 7}, + {"List corrupted.", 8}, + {" keys (real count). Expecting ", 9}, + {"Incorrect order.", 10}, + {"Size of a PriorityList cell: ", 11}, + {"Size of a BHeap cell : ", 12}, + {"Size of a FHeap cell : ", 13}, + {"Size of a PLList header : ", 14}, + {"Size of a CList cell : ", 15}, + {"Size of a SList cell : ", 16}, + {"Size of a BinHeap header : ", 17}, + {"Size of a BinHeap cell : ", 18}, + {"Creating a priority list and adding keys:\n", 19}, {"\ Ok.\n\ -List browsing...\n", 19}, +List browsing...\n", 20}, {"\ Ok.\n\ -Extract_Min + List browsing...\n", 20}, +Extract_Min + List browsing...\n", 21}, {"\ Ok.\n\ -Lower_Key(0) over 59...\n", 21}, +Lower_Key(0) over 59...\n", 22}, {"\ Ok.\n\ -Delete over 54...\n", 22}, +Delete over 54...\n", 23}, {"\ Ok.\n\ -Lower_Key(-12) over 30...\n", 23}, +Lower_Key(-12) over 30...\n", 24}, {"\ Ok.\n\ -Extract_Min...\n", 24}, +Extract_Min...\n", 25}, {"\ Ok.\n\ -Extracting datas...\n", 25}, - {"Minimum #", 26}, +Extracting datas...\n", 26}, + {"Minimum #", 27}, {"\ Ok.\n\ \n\ -All the tests were successfull\n", 27}, - {"Unknow priority list type: ", 28}, - {"Error opening file (", 29}, - {"Bad dictionnary structure. See doc/README.en (missing : separator)", 30}, - {"Bad dictionnary structure. See doc/README.en (missing word)", 31}, - {"Bad dictionnary structure. See doc/README.en (missing frequency)", 32}, - {"Error: \"", 33}, - {"\" is not a valid number.", 34}, - {"Huffman [{-f|-i} file] {type}", 35}, - {"Huffman -h", 36}, - {"By Nicolas Noble (nicolas@nobis-crew.org).", 37}, - {"This will encode the input file with the Huffman code", 38}, - {"using the priority list defined by type.", 39}, - {"Type is a number taken from this list:", 40}, - {" 0 : Binary Heap (default)", 41}, - {" 1 : Binomial Heap", 42}, - {" 2 : Fibbonacci Heap (bugged)", 43}, - {" 3 : Sorted chained list", 44}, - {"-f file means that you specify a dictionnary file which is", 45}, - {" structured as described into the README file.", 46}, - {"-i file means that you specify a file to encode. It will", 47}, - {" built a quiet dumb dictionnary.", 48}, - {"By default, a dictionnary will be built from stdin.", 49}, - {"-h prints this help and exit.", 50}, - {"Unknow option: ", 51}, - {"-i and -f options are exclusive", 52}, - {"Extra command: ", 53}, - {"-i needs a filename", 54}, - {"-f needs a filename", 55}, - {"Internal error.", 56}, - {" * Head cell. (", 57}, - {"Insert: not over Head.", 58}, - {"Insert: No more memory.", 59}, - {"Extract_Min: Priority List is empty.", 60}, +All the tests were successfull\n", 28}, + {"Usage: testTas [type]\n", 29}, + {"Extra command: ", 30}, + {"Error opening file (", 31}, + {"Bad dictionnary structure. See doc/README.en (missing : separator)", 32}, + {"Bad dictionnary structure. See doc/README.en (missing word)", 33}, + {"Bad dictionnary structure. See doc/README.en (missing frequency)", 34}, + {"Error: \"", 35}, + {"\" is not a valid number.", 36}, + {"Huffman [{-f|-i} file] {type}", 37}, + {"Huffman -h", 38}, + {"By Nicolas Noble (nicolas@nobis-crew.org).", 39}, + {"This will encode the input file with the Huffman code", 40}, + {"using the priority list defined by type.", 41}, + {"Type is a number taken from this list:", 42}, + {" 0 : Binary Heap (default)", 43}, + {" 1 : Binomial Heap", 44}, + {" 2 : Fibonacci Heap", 45}, + {" 3 : Sorted chained list", 46}, + {"-f file means that you specify a dictionnary file which is", 47}, + {" structured as described into the README file.", 48}, + {"-i file means that you specify a file to encode. It will", 49}, + {" built a quiet dumb dictionnary.", 50}, + {"By default, a dictionnary will be built from stdin.", 51}, + {"-h prints this help and exit.", 52}, + {"Unknow option: ", 53}, + {"-i and -f options are exclusive", 54}, + {"-i needs a filename", 55}, + {"-f needs a filename", 56}, + {"Internal error.", 57}, + {" * Head cell. (", 58}, + {"Insert: not over Head.", 59}, + {"Insert: No more memory.", 60}, + {"Extract_Min: Priority List is empty.", 61}, {"\ * Head cell.\n\ - |\n", 61}, - {"Not enough memory", 62}, - {"negative overflow", 63}, + |\n", 62}, + {"Not enough memory", 63}, + {"negative overflow", 64}, {"\ * Head cell\n\ - |\n", 64}, - {"Bitstream length : ", 65}, - {" bits (= ", 66}, - {" bytes)\n", 67}, - {"Real size input : ", 68}, - {"Size squeezed by : ", 69}, - {" percents\n", 70}, - {"Dictionnary size : ", 71}, - {"Total bitstream length : ", 72}, - {"Real gain (4 bytes header) : ", 73}, + |\n", 65}, + {"Bitstream length : ", 66}, + {" bits (= ", 67}, + {" bytes)\n", 68}, + {"Real size input : ", 69}, + {"Size squeezed by : ", 70}, + {" percents\n", 71}, + {"Dictionnary size : ", 72}, + {"Total bitstream length : ", 73}, + {"Real gain (4 bytes header) : ", 74}, }; -int _msg_tbl_length = 73; +int _msg_tbl_length = 74; @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-03-05 02:52+0100\n" +"POT-Creation-Date: 2001-03-07 01:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -14,194 +14,262 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: src/test.cc:33 +#: src/main.cc:35 src/main.cc:175 src/test.cc:37 src/test.cc:166 +msgid "Unknow priority list type: " +msgstr "" + +#: src/test.cc:49 msgid "Creation of a priority list and adding " msgstr "" -#: src/test.cc:33 +#: src/test.cc:49 msgid " random entrie(s)..." msgstr "" -#: src/test.cc:38 +#: src/test.cc:56 msgid "" "Ok.\n" "Deleting the list..." msgstr "" -#: src/test.cc:42 src/test.cc:46 +#: src/test.cc:60 src/test.cc:64 msgid "List has " msgstr "" -#: src/test.cc:42 +#: src/test.cc:60 msgid " keys. Expecting " msgstr "" -#: src/test.cc:43 src/test.cc:47 +#: src/test.cc:61 src/test.cc:65 msgid "List corrupted." msgstr "" -#: src/test.cc:46 +#: src/test.cc:64 msgid " keys (real count). Expecting " msgstr "" -#: src/test.cc:51 src/test.cc:119 +#: src/test.cc:69 src/test.cc:146 msgid "Incorrect order." msgstr "" -#: src/test.cc:66 +#: src/test.cc:84 msgid "Size of a PriorityList cell: " msgstr "" -#: src/test.cc:67 +#: src/test.cc:85 msgid "Size of a BHeap cell : " msgstr "" -#: src/test.cc:68 +#: src/test.cc:86 msgid "Size of a FHeap cell : " msgstr "" -#: src/test.cc:69 +#: src/test.cc:87 msgid "Size of a PLList header : " msgstr "" -#: src/test.cc:70 +#: src/test.cc:88 msgid "Size of a CList cell : " msgstr "" -#: src/test.cc:71 +#: src/test.cc:89 msgid "Size of a SList cell : " msgstr "" -#: src/test.cc:72 +#: src/test.cc:90 msgid "Size of a BinHeap header : " msgstr "" -#: src/test.cc:73 +#: src/test.cc:91 msgid "Size of a BinHeap cell : " msgstr "" -#: src/test.cc:87 +#: src/test.cc:105 msgid "Creating a priority list and adding keys:\n" msgstr "" -#: src/test.cc:99 src/test.cc:106 src/test.cc:110 +#: src/test.cc:122 src/test.cc:129 src/test.cc:133 src/test.cc:137 msgid "" "Ok.\n" "List browsing...\n" msgstr "" -#: src/test.cc:101 +#: src/test.cc:124 msgid "" "Ok.\n" "Extract_Min + List browsing...\n" msgstr "" -#: src/test.cc:104 +#: src/test.cc:127 msgid "" "Ok.\n" -"Lower_Key(-12) over 59...\n" +"Lower_Key(0) over 59...\n" msgstr "" -#: src/test.cc:108 +#: src/test.cc:131 msgid "" "Ok.\n" "Delete over 54...\n" msgstr "" -#: src/test.cc:114 +#: src/test.cc:135 +msgid "" +"Ok.\n" +"Lower_Key(-12) over 30...\n" +msgstr "" + +#: src/test.cc:139 +msgid "" +"Ok.\n" +"Extract_Min...\n" +msgstr "" + +#: src/test.cc:141 msgid "" "Ok.\n" "Extracting datas...\n" msgstr "" -#: src/test.cc:116 +#: src/test.cc:143 msgid "Minimum #" msgstr "" -#: src/test.cc:122 +#: src/test.cc:149 msgid "" "Ok.\n" "\n" "All the tests were successfull\n" msgstr "" -#: src/main.cc:29 +#: src/test.cc:155 +msgid "Usage: testTas [type]\n" +msgstr "" + +#: src/main.cc:179 src/test.cc:170 +msgid "Extra command: " +msgstr "" + +#: src/main.cc:46 src/main.cc:73 msgid "Error opening file (" msgstr "" -#: src/main.cc:44 +#: src/main.cc:79 +msgid "Bad dictionnary structure. See doc/README.en (missing : separator)" +msgstr "" + +#: src/main.cc:92 +msgid "Bad dictionnary structure. See doc/README.en (missing word)" +msgstr "" + +#: src/main.cc:103 +msgid "Bad dictionnary structure. See doc/README.en (missing frequency)" +msgstr "" + +#: src/main.cc:108 +msgid "Error: \"" +msgstr "" + +#: src/main.cc:108 +msgid "\" is not a valid number." +msgstr "" + +#: src/main.cc:117 msgid "Huffman [{-f|-i} file] {type}" msgstr "" -#: src/main.cc:45 +#: src/main.cc:118 +msgid "Huffman -h" +msgstr "" + +#: src/main.cc:119 msgid "By Nicolas Noble (nicolas@nobis-crew.org)." msgstr "" -#: src/main.cc:46 +#: src/main.cc:120 msgid "This will encode the input file with the Huffman code" msgstr "" -#: src/main.cc:47 +#: src/main.cc:121 msgid "using the priority list defined by type." msgstr "" -#: src/main.cc:48 +#: src/main.cc:122 msgid "Type is a number taken from this list:" msgstr "" -#: src/main.cc:49 +#: src/main.cc:123 msgid " 0 : Binary Heap (default)" msgstr "" -#: src/main.cc:50 +#: src/main.cc:124 msgid " 1 : Binomial Heap" msgstr "" -#: src/main.cc:51 -msgid " 2 : Fibbonacci Heap (bugged)" +#: src/main.cc:125 +msgid " 2 : Fibonacci Heap" msgstr "" -#: src/main.cc:52 +#: src/main.cc:126 msgid " 3 : Sorted chained list" msgstr "" -#: src/main.cc:53 +#: src/main.cc:127 msgid "-f file means that you specify a dictionnary file which is" msgstr "" -#: src/main.cc:54 +#: src/main.cc:128 msgid " structured as described into the README file." msgstr "" -#: src/main.cc:55 +#: src/main.cc:129 msgid "-i file means that you specify a file to encode. It will" msgstr "" -#: src/main.cc:56 +#: src/main.cc:130 msgid " built a quiet dumb dictionnary." msgstr "" -#: src/main.cc:57 +#: src/main.cc:131 msgid "By default, a dictionnary will be built from stdin." msgstr "" -#: src/main.cc:63 +#: src/main.cc:132 +msgid "-h prints this help and exit." +msgstr "" + +#: src/main.cc:147 msgid "Unknow option: " msgstr "" -#: lib/FHeap.cc:80 +#: src/main.cc:156 src/main.cc:165 +msgid "-i and -f options are exclusive" +msgstr "" + +#: src/main.cc:195 +msgid "-i needs a filename" +msgstr "" + +#: src/main.cc:200 +msgid "-f needs a filename" +msgstr "" + +#: src/main.cc:204 +msgid "Internal error." +msgstr "" + +#: lib/FHeap.cc:84 msgid " * Head cell. (" msgstr "" -#: lib/BHeap.cc:224 lib/FHeap.cc:160 +#: lib/BHeap.cc:224 lib/FHeap.cc:164 msgid "Insert: not over Head." msgstr "" -#: lib/BHeap.cc:226 lib/BHeap.cc:246 lib/FHeap.cc:182 +#: lib/BHeap.cc:226 lib/BHeap.cc:246 lib/FHeap.cc:186 msgid "Insert: No more memory." msgstr "" -#: lib/BHeap.cc:268 lib/FHeap.cc:192 lib/PLList.cc:150 +#: lib/BHeap.cc:268 lib/FHeap.cc:196 lib/PLList.cc:149 msgid "Extract_Min: Priority List is empty." msgstr "" @@ -211,52 +279,52 @@ msgid "" " |\n" msgstr "" -#: lib/BinHeap.cc:122 +#: lib/BinHeap.cc:129 msgid "Not enough memory" msgstr "" -#: lib/BinHeap.cc:149 +#: lib/BinHeap.cc:157 msgid "negative overflow" msgstr "" -#: lib/PLList.cc:126 +#: lib/PLList.cc:125 msgid "" " * Head cell\n" " |\n" msgstr "" -#: lib/HTree.cc:58 +#: lib/HTree.cc:82 msgid "Bitstream length : " msgstr "" -#: lib/HTree.cc:58 lib/HTree.cc:61 lib/HTree.cc:63 lib/HTree.cc:64 +#: lib/HTree.cc:82 lib/HTree.cc:85 lib/HTree.cc:87 lib/HTree.cc:88 msgid " bits (= " msgstr "" -#: lib/HTree.cc:60 lib/HTree.cc:61 lib/HTree.cc:63 lib/HTree.cc:68 +#: lib/HTree.cc:84 lib/HTree.cc:85 lib/HTree.cc:87 lib/HTree.cc:92 msgid " bytes)\n" msgstr "" -#: lib/HTree.cc:61 +#: lib/HTree.cc:85 msgid "Real size input : " msgstr "" -#: lib/HTree.cc:62 +#: lib/HTree.cc:86 msgid "Size squeezed by : " msgstr "" -#: lib/HTree.cc:62 lib/HTree.cc:70 +#: lib/HTree.cc:86 lib/HTree.cc:94 msgid " percents\n" msgstr "" -#: lib/HTree.cc:63 +#: lib/HTree.cc:87 msgid "Dictionnary size : " msgstr "" -#: lib/HTree.cc:64 +#: lib/HTree.cc:88 msgid "Total bitstream length : " msgstr "" -#: lib/HTree.cc:69 +#: lib/HTree.cc:93 msgid "Real gain (4 bytes header) : " msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PriorityList-1.0.0\n" -"POT-Creation-Date: 2001-03-05 02:52+0100\n" +"POT-Creation-Date: 2001-03-07 01:54+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Nicolas Noble <pixel@nobis-crew.org>\n" "Language-Team: French <fr@li.org>\n" @@ -14,15 +14,19 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: src/test.cc:33 +#: src/main.cc:35 src/main.cc:175 src/test.cc:37 src/test.cc:166 +msgid "Unknow priority list type: " +msgstr "File de priorité inconnue: " + +#: src/test.cc:49 msgid "Creation of a priority list and adding " msgstr "Création d'une liste de priorité et ajout de " -#: src/test.cc:33 +#: src/test.cc:49 msgid " random entrie(s)..." msgstr " entrée(s) aléatoires..." -#: src/test.cc:38 +#: src/test.cc:56 msgid "" "Ok.\n" "Deleting the list..." @@ -30,63 +34,63 @@ msgstr "" "Ok.\n" "Effacement de la liste..." -#: src/test.cc:42 src/test.cc:46 +#: src/test.cc:60 src/test.cc:64 msgid "List has " msgstr "La liste possède " -#: src/test.cc:42 +#: src/test.cc:60 msgid " keys. Expecting " msgstr " clefs alors que nous attendions " -#: src/test.cc:43 src/test.cc:47 +#: src/test.cc:61 src/test.cc:65 msgid "List corrupted." msgstr "Liste corrompue." -#: src/test.cc:46 +#: src/test.cc:64 msgid " keys (real count). Expecting " msgstr " clefs (compte réel) alors que nous attendions " -#: src/test.cc:51 src/test.cc:119 +#: src/test.cc:69 src/test.cc:146 msgid "Incorrect order." msgstr "Ordre incorrect." -#: src/test.cc:66 +#: src/test.cc:84 msgid "Size of a PriorityList cell: " msgstr "Taille d'une cellule du type PriorityList: " -#: src/test.cc:67 +#: src/test.cc:85 msgid "Size of a BHeap cell : " msgstr "Taille d'une cellule du type BHeap : " -#: src/test.cc:68 +#: src/test.cc:86 msgid "Size of a FHeap cell : " msgstr "Taille d'une cellule du type FHeap : " -#: src/test.cc:69 +#: src/test.cc:87 msgid "Size of a PLList header : " msgstr "Taille d'un entète du type PLList : " -#: src/test.cc:70 +#: src/test.cc:88 msgid "Size of a CList cell : " msgstr "Taille d'une cellule du type CList : " -#: src/test.cc:71 +#: src/test.cc:89 msgid "Size of a SList cell : " msgstr "Taille d'une cellule du type SList : " -#: src/test.cc:72 +#: src/test.cc:90 msgid "Size of a BinHeap header : " msgstr "Taille d'un entête du type BinHeap : " -#: src/test.cc:73 +#: src/test.cc:91 msgid "Size of a BinHeap cell : " msgstr "Taille d'une cellule du type BinHeap : " -#: src/test.cc:87 +#: src/test.cc:105 msgid "Creating a priority list and adding keys:\n" msgstr "Création d'une liste de priorité et ajout de clefs:\n" -#: src/test.cc:99 src/test.cc:106 src/test.cc:110 +#: src/test.cc:122 src/test.cc:129 src/test.cc:133 src/test.cc:137 msgid "" "Ok.\n" "List browsing...\n" @@ -94,7 +98,7 @@ msgstr "" "Ok.\n" "Exploration de la liste...\n" -#: src/test.cc:101 +#: src/test.cc:124 msgid "" "Ok.\n" "Extract_Min + List browsing...\n" @@ -102,15 +106,15 @@ msgstr "" "Ok.\n" "Extract_Min + Exploration de la liste...\n" -#: src/test.cc:104 +#: src/test.cc:127 msgid "" "Ok.\n" -"Lower_Key(-12) over 59...\n" +"Lower_Key(0) over 59...\n" msgstr "" "Ok.\n" -"Lower_Key(-12) sur 59...\n" +"Lower_Key(0) sur 59...\n" -#: src/test.cc:108 +#: src/test.cc:131 msgid "" "Ok.\n" "Delete over 54...\n" @@ -118,7 +122,23 @@ msgstr "" "Ok.\n" "Delete sur 54...\n" -#: src/test.cc:114 +#: src/test.cc:135 +msgid "" +"Ok.\n" +"Lower_Key(-12) over 30...\n" +msgstr "" +"Ok.\n" +"Lower_Key(-12) sur 30...\n" + +#: src/test.cc:139 +msgid "" +"Ok.\n" +"Extract_Min...\n" +msgstr "" +"Ok.\n" +"Extract_Min...\n" + +#: src/test.cc:141 msgid "" "Ok.\n" "Extracting datas...\n" @@ -126,11 +146,11 @@ msgstr "" "Ok.\n" "Extraction des données...\n" -#: src/test.cc:116 +#: src/test.cc:143 msgid "Minimum #" msgstr "Minimum #" -#: src/test.cc:122 +#: src/test.cc:149 msgid "" "Ok.\n" "\n" @@ -140,83 +160,138 @@ msgstr "" "\n" "Tous les tests se sont déroulés correctement\n" -#: src/main.cc:29 +#: src/test.cc:155 +msgid "Usage: testTas [type]\n" +msgstr "Usage: testTas [type]\n" + +#: src/main.cc:179 src/test.cc:170 +msgid "Extra command: " +msgstr "Commande supplémentaire: " + +#: src/main.cc:46 src/main.cc:73 msgid "Error opening file (" msgstr "Erreur à l'ouverture du fichier (" -#: src/main.cc:44 +#: src/main.cc:79 +msgid "Bad dictionnary structure. See doc/README.en (missing : separator)" +msgstr "" +"Mauvaise structure de dictionnaire. Voir doc/README.fr (manque le séparateur " +":)" + +#: src/main.cc:92 +msgid "Bad dictionnary structure. See doc/README.en (missing word)" +msgstr "Mauvaise structure de dictionnaire. Voir doc/README.fr (manque le mot)" + +#: src/main.cc:103 +msgid "Bad dictionnary structure. See doc/README.en (missing frequency)" +msgstr "" +"Mauvaise structure de dictionnaire. Voir doc/README.fr (manque la fréquence)" + +#: src/main.cc:108 +msgid "Error: \"" +msgstr "Erreur: \"" + +#: src/main.cc:108 +msgid "\" is not a valid number." +msgstr "\" n'est pas un nombre valude." + +#: src/main.cc:117 msgid "Huffman [{-f|-i} file] {type}" -msgstr "Huffman [{-f|-i} file] {type}" +msgstr "Huffman [{-f|-i} fichier] {type}" + +#: src/main.cc:118 +msgid "Huffman -h" +msgstr "Huffman -h" -#: src/main.cc:45 +#: src/main.cc:119 msgid "By Nicolas Noble (nicolas@nobis-crew.org)." msgstr "Par Nicolas Noble {nicolas@nobis-crew.org)." -#: src/main.cc:46 +#: src/main.cc:120 msgid "This will encode the input file with the Huffman code" -msgstr "" +msgstr "Ceci encodera le fichier d'entrée avec le code d'Huffman" -#: src/main.cc:47 +#: src/main.cc:121 msgid "using the priority list defined by type." -msgstr "" +msgstr "en utilisant la file de priorité définie par type." -#: src/main.cc:48 +#: src/main.cc:122 msgid "Type is a number taken from this list:" -msgstr "" +msgstr "Type est un nombre pris dans cette liste:" -#: src/main.cc:49 +#: src/main.cc:123 msgid " 0 : Binary Heap (default)" -msgstr "" +msgstr " 0 : Tas binaire (défaut)" -#: src/main.cc:50 +#: src/main.cc:124 msgid " 1 : Binomial Heap" -msgstr "" +msgstr " 1 : Tas binomial" -#: src/main.cc:51 -msgid " 2 : Fibbonacci Heap (bugged)" -msgstr "" +#: src/main.cc:125 +msgid " 2 : Fibonacci Heap" +msgstr " 2: Tas de Fibonacci" -#: src/main.cc:52 +#: src/main.cc:126 msgid " 3 : Sorted chained list" -msgstr "" +msgstr " 3 : Liste chaînée triée" -#: src/main.cc:53 +#: src/main.cc:127 msgid "-f file means that you specify a dictionnary file which is" -msgstr "" +msgstr "-f fichier signifie que vous spécifier un fichier de dictionnaire" -#: src/main.cc:54 +#: src/main.cc:128 msgid " structured as described into the README file." -msgstr "" +msgstr " structuré comme décrit dans le fichier README." -#: src/main.cc:55 +#: src/main.cc:129 msgid "-i file means that you specify a file to encode. It will" -msgstr "" +msgstr "-f fichier signifie que vous spécifiez un fichier à encoder." -#: src/main.cc:56 +#: src/main.cc:130 msgid " built a quiet dumb dictionnary." -msgstr "" +msgstr " Un dictionnaire simpliste sera construit." -#: src/main.cc:57 +#: src/main.cc:131 msgid "By default, a dictionnary will be built from stdin." -msgstr "" +msgstr "Par défaut, un dictionnaire sera construit depuis stdin." + +#: src/main.cc:132 +msgid "-h prints this help and exit." +msgstr "-h affiche l'aide et quitte." -#: src/main.cc:63 +#: src/main.cc:147 msgid "Unknow option: " -msgstr "" +msgstr "Option inconnue: " + +#: src/main.cc:156 src/main.cc:165 +msgid "-i and -f options are exclusive" +msgstr "les options -i et -f sont exclusives" + +#: src/main.cc:195 +msgid "-i needs a filename" +msgstr "-i nécessite un fichier" + +#: src/main.cc:200 +msgid "-f needs a filename" +msgstr "-f nécessite un fichier" + +#: src/main.cc:204 +msgid "Internal error." +msgstr "Erreur interne." -#: lib/FHeap.cc:80 +#: lib/FHeap.cc:84 msgid " * Head cell. (" msgstr " * Cellule d'entête. (" -#: lib/BHeap.cc:224 lib/FHeap.cc:160 +#: lib/BHeap.cc:224 lib/FHeap.cc:164 msgid "Insert: not over Head." msgstr "Insert: pas sur l'entête." -#: lib/BHeap.cc:226 lib/BHeap.cc:246 lib/FHeap.cc:182 +#: lib/BHeap.cc:226 lib/BHeap.cc:246 lib/FHeap.cc:186 msgid "Insert: No more memory." msgstr "Insert: Plus de mémoire." -#: lib/BHeap.cc:268 lib/FHeap.cc:192 lib/PLList.cc:150 +#: lib/BHeap.cc:268 lib/FHeap.cc:196 lib/PLList.cc:149 msgid "Extract_Min: Priority List is empty." msgstr "Extract_Min: File de priorité vide." @@ -228,15 +303,15 @@ msgstr "" " * Cellule d'entête.\n" " |\n" -#: lib/BinHeap.cc:122 +#: lib/BinHeap.cc:129 msgid "Not enough memory" msgstr "Pas assez de mémoire" -#: lib/BinHeap.cc:149 +#: lib/BinHeap.cc:157 msgid "negative overflow" msgstr "Débordement négatif" -#: lib/PLList.cc:126 +#: lib/PLList.cc:125 msgid "" " * Head cell\n" " |\n" @@ -244,38 +319,38 @@ msgstr "" " * Cellule d'entête.\n" " |\n" -#: lib/HTree.cc:58 +#: lib/HTree.cc:82 msgid "Bitstream length : " msgstr "Taille du flux de bits : " -#: lib/HTree.cc:58 lib/HTree.cc:61 lib/HTree.cc:63 lib/HTree.cc:64 +#: lib/HTree.cc:82 lib/HTree.cc:85 lib/HTree.cc:87 lib/HTree.cc:88 msgid " bits (= " msgstr " bits (= " -#: lib/HTree.cc:60 lib/HTree.cc:61 lib/HTree.cc:63 lib/HTree.cc:68 +#: lib/HTree.cc:84 lib/HTree.cc:85 lib/HTree.cc:87 lib/HTree.cc:92 msgid " bytes)\n" msgstr " octets)\n" -#: lib/HTree.cc:61 +#: lib/HTree.cc:85 msgid "Real size input : " msgstr "Taille réelle de l'entrée : " -#: lib/HTree.cc:62 +#: lib/HTree.cc:86 msgid "Size squeezed by : " msgstr "Taille réduite de : " -#: lib/HTree.cc:62 lib/HTree.cc:70 +#: lib/HTree.cc:86 lib/HTree.cc:94 msgid " percents\n" msgstr " pourcents\n" -#: lib/HTree.cc:63 +#: lib/HTree.cc:87 msgid "Dictionnary size : " msgstr "Taille du dictionnaire : " -#: lib/HTree.cc:64 +#: lib/HTree.cc:88 msgid "Total bitstream length : " msgstr "Taille totale du flux de bits : " -#: lib/HTree.cc:69 +#: lib/HTree.cc:93 msgid "Real gain (4 bytes header) : " msgstr "Gain réel (entête de 4 octets) : " diff --git a/src/main.cc b/src/main.cc index 16e9985..ac62d21 100644 --- a/src/main.cc +++ b/src/main.cc @@ -122,7 +122,7 @@ void Usage(void) cerr << _("Type is a number taken from this list:") << endl; cerr << _(" 0 : Binary Heap (default)") << endl; cerr << _(" 1 : Binomial Heap") << endl; - cerr << _(" 2 : Fibbonacci Heap (bugged)") << endl; + cerr << _(" 2 : Fibonacci Heap") << endl; cerr << _(" 3 : Sorted chained list") << endl; cerr << _("-f file means that you specify a dictionnary file which is") << endl; cerr << _(" structured as described into the README file.") << endl; @@ -177,6 +177,7 @@ int main(int argc, char **argv) } if (method != -1) { cerr << _("Extra command: ") << *argv << endl; + Usage(); } method = (*argv)[0] - '0'; } diff --git a/src/test.cc b/src/test.cc index c5be9b8..cc84d6a 100644 --- a/src/test.cc +++ b/src/test.cc @@ -18,12 +18,28 @@ void exception(int e, char *msg) exit(-1); } -PriorityList *newlist(void) +PriorityList *newlist(int method) { - return new FHeap; + switch (method) { + case 0: + return new BinHeap; + break; + case 1: + return new BHeap; + break; + case 2: + return new FHeap; + break; + case 3: + return new PLList; + break; + default: + cerr << _("Unknow priority list type: ") << method << endl; + exit(-1); + } } -void DoCombTest(int number) +void DoCombTest(int method, int number) { int i, n; Key_t K, oK; @@ -31,7 +47,7 @@ void DoCombTest(int number) PriorityList *T; cerr << _("Creation of a priority list and adding ") << number << _(" random entrie(s)..."); - T = newlist(); + T = newlist(method); for (i = 1; i <= number; i++) { // T->Insert(rand() % P_INFINITY, NULL); // T->Insert(rand() % 100, NULL); @@ -57,7 +73,7 @@ void DoCombTest(int number) cerr << "Ok.\n"; } -void FullTest(void) +void FullTest(int method) { PriorityList *T; Datas_t Datas; @@ -74,20 +90,20 @@ void FullTest(void) cerr << _("Size of a BinHeap header : ") << sizeof(BinHeap) << endl; cerr << _("Size of a BinHeap cell : ") << sizeof(binheap_t) << endl; - DoCombTest(0); - DoCombTest(30); - DoCombTest(70); - DoCombTest(1000); -// DoCombTest(10000); + DoCombTest(method, 0); + DoCombTest(method, 30); + DoCombTest(method, 70); + DoCombTest(method, 1000); +// DoCombTest(method, 10000); #ifdef BT - DoCombTest(100000); + DoCombTest(method, 100000); #ifdef VBT - DoCombTest(1000000); + DoCombTest(method, 1000000); #endif #endif cerr << _("Creating a priority list and adding keys:\n"); - T = newlist(); + T = newlist(method); for (i = 0; i < 30; i++) { fprintf(stderr, "%i ", N[i]); C1 = T->Insert(N[i], NULL); @@ -134,7 +150,31 @@ void FullTest(void) return; } +void Usage(void) +{ + cerr << _("Usage: testTas [type]\n"); + exit(-1); +} + int main(int argc, char **argv) { - FullTest(); + int method = -1; + + while (--argc) { + argv++; + if ((strlen(*argv) != 1) || (((*argv)[0] < '0' || (*argv)[0] > '3'))) { + cerr << _("Unknow priority list type: ") << *argv << endl; + Usage(); + } + if (method != -1) { + cerr << _("Extra command: ") << *argv << endl; + Usage(); + } + method = (*argv)[0] - '0'; + } + + if (method == -1) + method = 0; + FullTest(method); + return 0; } |