!include once #1028249 // LineComp_PairIndex_v2 [dev.] sclass LineCompCompressor { int safety = 0; replace Encodings with Map>. replace LineComp_PairIndex with LineComp_PairIndex_v2. abstract sclass Chunk { abstract S text(L chunks); } srecord CPair(int i1, int i2) > Chunk { CPair(IntPair p) { i1 = p.a; i2 = p.b; } S text(L chunks) { ret linesLL_rtrim(chunks.get(i1).text(chunks), chunks.get(i2).text(chunks)); } } srecord CPrim(S s) > Chunk { S text(L chunks) { ret s; } } bool verbose = false, verboseCompressionSteps = false; bool sortLines = true; bool verify = true; Map textIDToLines; LS allUniqueLines; new L chunks; int primChunks; Map lineIndex; Encodings finalEncodings; new Map existingPairsIndex; // key = version ID, values = text *(SS texts) { textIDToLines = mapValuesToLinkedHashMap myToLines(texts); } LS myToLines(S s) { ret toLines_nOnly_reversible(s); } S myFromLines(LS l) { ret fromLines_rtrim(l); } run { LS allLines = concatLists(values(textIDToLines)); if (verboseCompressionSteps) print("Uniquifying " + nLines(allLines)); allUniqueLines = uniquify(allLines); if (verboseCompressionSteps) print("Have " + n2(allUniqueLines, "unique line")); allLines = null; // allow me to forget if (sortLines) sortInPlace(allUniqueLines); if (verboseCompressionSteps) print("Sorted " + nLines(allUniqueLines)); for (S line : allUniqueLines) chunks.add(new CPrim(line)); primChunks = l(chunks); lineIndex = listIndex(collect s(chunks)); // simple encoding (only direct line references) Encodings simpleEncodings = mapValues(textIDToLines, (IF1>) (lines -> map(lines, line -> lineIndex.get(line)))); //printAndCheckEncodings(simpleEncodings); if (verboseCompressionSteps) print("Have simple encodings"); finalEncodings = compressPairs_v3(simpleEncodings); if (verbose || verify) printAndCheckEncodings(finalEncodings); } void saveAsTextFile(File f) { S out = exportEncoding(finalEncodings); saveTextFile(f, out); if (verify) checkDecompression(f, textIDToLines); } void checkDecompression(File file, Map textIDToLines) { print("Verifying archive"); temp BufferedReader reader = bufferedUtf8Reader(file); LineCompReader lcr = new(reader); assertEquals(keysList(textIDToLines), asList(lcr.versions())); for (S version : keys(textIDToLines)) assertEquals(lcr.textForVersion(version), lines_rtrim(textIDToLines.get(version))); if (verbose) print("Decompression OK for " + nVersions(textIDToLines)); } S asText() { ret exportEncoding(finalEncodings); } S exportEncoding(Encodings encodings) { new LS buf; buf.add("LINECOMP " + primChunks); // magic signature for (Chunk c : chunks) { if (c cast CPair) buf.add(c.i1 + " " + c.i2); else buf.add(((CPrim) c).s); } for (S id, L l : encodings) buf.add(id + "=" + joinWithSpace(l)); ret lines_rtrim(buf); } // new fastest version of magic compression function // (O(n log n) or even better?) Encodings compressPairs_v3(Encodings encodings) { new LineComp_PairIndex pairIndex; pairIndex.verbose = verboseCompressionSteps; for (S version, L l : encodings) pairIndex.newChain(version, l); IntPair toCompress; // Compress only most popular pair in one step while ping ((toCompress = pairIndex.mostPopularDuplicate()) != null) { if (safety > 0 && --safety <= 0) fail("safety"); //pairIndex.fullCheck(); int count = pairIndex.getCount(toCompress); Int idx = makeCPair(toCompress); int dups = pairIndex.numberOfDuplicates(); if (verboseCompressionSteps) print("Compressing pair " + toCompress + " (count=" + count + ") -> " + idx + ", " + (dups-1) + " remaining"); pairIndex.replacePair(toCompress.a, toCompress.b, idx); } // reconvert to normal list ret mapValues(ch -> ch.toList(), pairIndex.chains); } // TODO: check if pair is already there Int makeCPair(IntPair p) { Int idx = existingPairsIndex.get(p); if (idx == null) existingPairsIndex.put(p, idx = addAndReturnIndex(chunks, new CPair(p))); ret idx; } void printAndCheckEncodings(Encodings encodings) { for (S id, L encoded : encodings) { if (verbose) print(id + ": " + joinWithSpace(encoded)); assertEquals(myFromLines(textIDToLines.get(id)), decode(encoded)); } } S decode(L encoded) { ret myFromLines(lambdaMap chunkText(encoded)); } S chunkText(int idx) { ret chunks.get(idx).text(chunks); } }