#include "Compare.h"
+#include "Author.h"
#include "BufferParams.h"
#include "Changes.h"
+#include "Font.h"
#include "insets/InsetText.h"
#include "support/lassert.h"
+#include "support/qstring_helpers.h"
#include <boost/next_prior.hpp>
-#include <cmath>
-
using namespace std;
using namespace lyx::support;
class DocPair {
public:
- DocPair() {}
+ DocPair()
+ {}
DocPair(DocIterator o_, DocIterator n_)
: o(o_), n(n_)
{}
- bool operator!=(DocPair const & rhs) {
+ bool operator!=(DocPair const & rhs)
+ {
// this might not be intuitive but correct for our purpose
return o != rhs.o && n != rhs.n;
}
{}
/// Returns the from pair
- DocPair from() const { return DocPair(o.from, n.from); }
+ DocPair from() const
+ {
+ return DocPair(o.from, n.from);
+ }
/// Returns the to pair
- DocPair to() const { return DocPair(o.to, n.to); }
+ DocPair to() const
+ {
+ return DocPair(o.to, n.to);
+ }
DocRange o;
DocRange n;
template<class T>
class compl_vector {
public:
- compl_vector() {}
+ compl_vector()
+ {}
void reset(T const & def)
{
public:
///
Impl(Compare const & compare)
- : abort_(false), compare_(compare)
+ : abort_(false), compare_(compare), recursion_level_(0), D_(0)
{}
///
- ~Impl() {}
+ ~Impl()
+ {}
// Algorithm to find the shortest edit string. This algorithm
// only needs a linear amount of memory (linear with the sum
/// Set to true to cancel the algorithm
bool abort_;
+ ///
+ QString status()
+ {
+ QString status;
+ status += toqstr("recursion level:") + " " + QString::number(recursion_level_)
+ + " " + toqstr("differences:") + " " + QString::number(D_);
+ return status;
+ }
+
private:
/// Finds the middle snake and returns the length of the
/// shortest edit script.
SnakeResult retrieveMiddleSnake(int k, int D, Direction direction,
DocPair & middle_snake);
- /// Find the the furthest reaching D-path (number of horizontal
+ /// Find the furthest reaching D-path (number of horizontal
/// and vertical steps; differences between the old and new
/// document) in the k-diagonal (vertical minus horizontal steps).
void furthestDpathKdiagonal(int D, int k,
/// around the middle snake.
void diff_i(DocRangePair const & rp);
- /// Processes the splitted chunks. It either adds them as deleted,
+ /// Processes the split chunks. It either adds them as deleted,
/// as added, or call diff_i for further processing.
void diffPart(DocRangePair const & rp);
compl_vector<DocIterator> nrp;
compl_vector<DocIterator> ors;
compl_vector<DocIterator> nrs;
+
+ /// The number of differences in the path the algorithm
+ /// is currently processing.
+ int D_;
};
/////////////////////////////////////////////////////////////////////
: new_buffer(new_buf), old_buffer(old_buf), dest_buffer(dest_buf),
options_(options), pimpl_(new Impl(*this))
{
+ connect(&status_timer_, SIGNAL(timeout()),
+ this, SLOT(doStatusMessage()));
+ status_timer_.start(1000);
+}
+
+
+void Compare::doStatusMessage()
+{
+ statusMessage(pimpl_->status());
}
if (!dest_buffer || !new_buffer || !old_buffer)
return;
- // Copy the buffer params to the new buffer
+ // Copy the buffer params to the destination buffer
dest_buffer->params() = options_.settings_from_new
? new_buffer->params() : old_buffer->params();
+ // Copy extra authors to the destination buffer
+ AuthorList const & extra_authors = options_.settings_from_new ?
+ old_buffer->params().authors() : new_buffer->params().authors();
+ AuthorList::Authors::const_iterator it = extra_authors.begin();
+ for (; it != extra_authors.end(); it++)
+ dest_buffer->params().authors().record(*it);
+
+ doStatusMessage();
+
// do the real work
if (!doCompare())
return;
}
-static bool equal(DocIterator & o, DocIterator & n) {
+static bool equal(DocIterator & o, DocIterator & n)
+{
+ // Explicitly check for this, so we won't call
+ // Paragraph::getChar for the last pos.
+ bool const o_lastpos = o.pos() == o.lastpos();
+ bool const n_lastpos = n.pos() == n.lastpos();
+ if (o_lastpos || n_lastpos)
+ return o_lastpos && n_lastpos;
+
Paragraph const & old_par = o.text()->getPar(o.pit());
Paragraph const & new_par = n.text()->getPar(n.pit());
// Where do we take the step from ?
int const kk = vertical_step ? k + 1 : k - 1;
DocPair p(op[kk], np[kk]);
+ DocPair const s(os[kk], ns[kk]);
// If D==0 we simulate a vertical step from (0,-1) by doing nothing.
if (D != 0) {
ns[k] = p.n;
} else {
// Copy last snake from the previous step
- os[k] = os[kk];
- ns[k] = ns[kk];
+ os[k] = s.o;
+ ns[k] = s.n;
}
//Record new position
if (os[k].empty() && os_r[kk].empty()) {
// No, there is no snake at all, in which case
// the length of the shortest edit script is M+N.
- LASSERT(2 * D - odd_offset_ == M_ + N_, /**/);
+ LATTEST(2 * D - odd_offset_ == M_ + N_);
return NoSnake;
}
ors.reset(DocIterator());
nrs.reset(DocIterator());
+ // In the formula below, the "+ 1" ensures we round like ceil()
+ int const D_max = (M_ + N_ + 1)/2;
// D is the number of horizontal and vertical steps, i.e.
// different characters in the old and new chunk.
- int const D_max = ceil(((double)M_ + N_)/2);
for (int D = 0; D <= D_max; ++D) {
+ // to be used in the status messages
+ D_ = D;
// Forward and reverse paths
for (int f = 0; f < 2; ++f) {
return 2 * D - odd_offset_;
}
}
+ if (abort_)
+ return 0;
}
}
}
processSnake(snake);
// Start the recursive algorithm
- diff_i(rp);
+ DocRangePair rp_new(from, rp.to());
+ if (!rp_new.o.empty() || !rp_new.n.empty())
+ diff_i(rp_new);
for (pit_type p = 0; p < (pit_type)dest_pars_->size(); ++p) {
(*dest_pars_)[p].setBuffer(const_cast<Buffer &>(*dest_buf));
void Compare::Impl::diff_i(DocRangePair const & rp)
{
+ if (abort_)
+ return;
+
// The middle snake
DocPair middle_snake;
pit_type const pit = it.o.pit() - rp.o.from.pit();
pos_type const pos = pit ? it.o.pos() : it.o.pos() - rp.o.from.pos();
inset = pars[pit].getInset(pos);
- LASSERT(inset, /**/);
+ LASSERT(inset, continue);
diffInset(inset, it);
}
}