gecoder-with-gecode 0.9.0 → 0.9.1

data/ext/gecode-2.1.1/gecode/gist/postscript.hh

@@ -1,56 +0,0 @@
-/*
- *  Main authors:
- *     Guido Tack <tack@gecode.org>
- *
- *  Copyright:
- *     Guido Tack, 2006
- *
- *  Last modified:
- *     $Date: 2007-11-26 15:48:52 +0100 (Mon, 26 Nov 2007) $ by $Author: tack $
- *     $Revision: 5437 $
- *
- *  This file is part of Gecode, the generic constraint
- *  development environment:
- *     http://www.gecode.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#ifndef GECODE_GIST_POSTSCRIPT_HH
-#define GECODE_GIST_POSTSCRIPT_HH
-
-#include "gecode/gist/visualnode.hh"
-#include <iostream>
-
-namespace Gecode { namespace Gist {
-  
-  /// \brief Postscript output of search trees
-  class Postscript {
-  public:
-    /// Print postscript for \a tree to \a out
-    static void output(std::ostream& out, VisualNode* tree);
-  };
-  
-}}
-
-#endif
-
-// STATISTICS: gist-any

data/ext/gecode-2.1.1/gecode/gist/preferences.cc

@@ -1,110 +0,0 @@
-/*
- *  Main authors:
- *     Guido Tack <tack@gecode.org>
- *
- *  Copyright:
- *     Guido Tack, 2007
- *
- *  Last modified:
- *     $Date: 2008-01-13 13:20:50 +0100 (Sun, 13 Jan 2008) $ by $Author: schulte $
- *     $Revision: 5857 $
- *
- *  This file is part of Gecode, the generic constraint
- *  development environment:
- *     http://www.gecode.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#include "gecode/gist/preferences.hh"
-
-namespace Gecode { namespace Gist {
-  
-  PreferencesDialog::PreferencesDialog(QWidget *parent) : QDialog(parent) {
-    QSettings settings("gecode.org", "Gist");
-    hideFailed = settings.value("search/hideFailed", true).toBool();
-    zoom = settings.value("search/zoom", false).toBool();
-    refresh = settings.value("search/refresh", 500).toInt();
-    
-    hideCheck =
-      new QCheckBox(tr("Hide failed subtrees automatically"));
-    hideCheck->setChecked(hideFailed);
-    zoomCheck =
-      new QCheckBox(tr("Zoom to fit automatically"));
-    zoomCheck->setChecked(zoom);
-    
-    QPushButton* defButton = new QPushButton(tr("Defaults"));
-    QPushButton* cancelButton = new QPushButton(tr("Cancel"));
-    QPushButton* okButton = new QPushButton(tr("Ok"));
-    okButton->setDefault(true);
-    QHBoxLayout* buttonLayout = new QHBoxLayout();
-    buttonLayout->addWidget(defButton);
-    buttonLayout->addWidget(cancelButton);
-    buttonLayout->addWidget(okButton);
-    
-    connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
-    connect(defButton, SIGNAL(clicked()), this, SLOT(defaults()));
-    connect(okButton, SIGNAL(clicked()), this, SLOT(writeBack()));
-    
-    QLabel* refreshLabel = new QLabel(tr("Display refresh rate:"));
-    refreshBox  = new QSpinBox();
-    refreshBox->setRange(0, 1000000);
-    refreshBox->setValue(refresh);
-    refreshBox->setSingleStep(100);
-    QHBoxLayout* refreshLayout = new QHBoxLayout();
-    refreshLayout->addWidget(refreshLabel);
-    refreshLayout->addWidget(refreshBox);
-    
-    QVBoxLayout* layout = new QVBoxLayout();
-    layout->addWidget(hideCheck);
-    layout->addWidget(zoomCheck);
-    layout->addLayout(refreshLayout);
-    layout->addLayout(buttonLayout);
-    setLayout(layout);
-    setWindowTitle(tr("Preferences"));
-  }
-
-  void
-  PreferencesDialog::writeBack(void) {
-    hideFailed = hideCheck->isChecked();
-    zoom = zoomCheck->isChecked();
-    refresh = refreshBox->value();
-    QSettings settings("gecode.org", "Gist");
-    settings.setValue("search/hideFailed", hideFailed);
-    settings.setValue("search/zoom", zoom);
-    settings.setValue("search/refresh", refresh);
-    
-    accept();
-  }
-
-  void
-  PreferencesDialog::defaults(void) {
-    hideFailed = true;
-    zoom = false;
-    refresh = 500;
-    hideCheck->setChecked(hideFailed);
-    zoomCheck->setChecked(zoom);
-    refreshBox->setValue(refresh);
-  }
-  
-}}
-
-// STATISTICS: gist-any

data/ext/gecode-2.1.1/gecode/gist/preferences.hh

@@ -1,76 +0,0 @@
-/*
- *  Main authors:
- *     Guido Tack <tack@gecode.org>
- *
- *  Copyright:
- *     Guido Tack, 2007
- *
- *  Last modified:
- *     $Date: 2008-01-13 13:20:50 +0100 (Sun, 13 Jan 2008) $ by $Author: schulte $
- *     $Revision: 5857 $
- *
- *  This file is part of Gecode, the generic constraint
- *  development environment:
- *     http://www.gecode.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#ifndef GECODE_GIST_PREFERENCES_HH
-#define GECODE_GIST_PREFERENCES_HH
-
-#include <QtGui>
-
-namespace Gecode { namespace Gist {
-  
-  /**
-   * \brief Preferences dialog for %Gist
-   */
-  class PreferencesDialog : public QDialog {
-    Q_OBJECT
-    
-  protected:
-    QCheckBox* hideCheck;
-    QCheckBox* zoomCheck;
-    QSpinBox*  refreshBox;
-  protected Q_SLOTS:
-    /// Write settings
-    void writeBack(void);
-    /// Reset to defaults
-    void defaults(void);
-  public:
-    /// Constructor
-    PreferencesDialog(QWidget* parent = 0);
-    
-    /// Whether to automatically hide failed subtrees during search
-    bool hideFailed;
-    /// Whether to automatically zoom during search
-    bool zoom;
-    /// How often to refresh the display during search
-    int refresh;
-    
-  };
-  
-}}
-
-#endif
-
-// STATISTICS: gist-any

data/ext/gecode-2.1.1/gecode/gist/reflectionhelpers.cc

@@ -1,55 +0,0 @@
-/*
- *  Main authors:
- *     Niko Paltzer <nikopp@ps.uni-sb.de>
- *
- *  Copyright:
- *     Niko Paltzer, 2007
- *
- *  Last modified:
- *     $Date: 2008-01-07 14:22:23 +0100 (Mon, 07 Jan 2008) $ by $Author: tack $
- *     $Revision: 5768 $
- *
- *  This file is part of Gecode, the generic constraint
- *  development environment:
- *     http://www.gecode.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#include "gecode/gist/reflectionhelpers.hh"
-
-namespace Gecode { namespace Gist {
-
-IntVar
-ReflectionHelpers::toIntVar(Reflection::VarMap& vm, int i) {
-  IntVar v = vm.var(i);
-  return v;
-}
-
-IntVar
-ReflectionHelpers::toIntVar(Reflection::VarMap& vm, Support::Symbol s) {
-  IntVar v = vm.var(s);
-  return v;
-}
-
-}}
-
-// STATISTICS: gist-any

data/ext/gecode-2.1.1/gecode/gist/reflectionhelpers.hh

@@ -1,58 +0,0 @@
-/*
- *  Main authors:
- *     Niko Paltzer <nikopp@ps.uni-sb.de>
- *
- *  Copyright:
- *     Niko Paltzer, 2007
- *
- *  Last modified:
- *     $Date: 2007-12-10 18:34:13 +0100 (Mon, 10 Dec 2007) $ by $Author: nikopp $
- *     $Revision: 5660 $
- *
- *  This file is part of Gecode, the generic constraint
- *  development environment:
- *     http://www.gecode.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-// TODO nikopp: doxygen comments
-
-#ifndef GECODE_GIST_REFLECTIONHELPERS_HH
-#define GECODE_GIST_REFLECTIONHELPERS_HH
-
-#include <gecode/kernel.hh>
-#include <gecode/int.hh>
-
-namespace Gecode { namespace Gist {
-
-class ReflectionHelpers
-{
-public:
-  static IntVar toIntVar(Reflection::VarMap&, int);
-  static IntVar toIntVar(Reflection::VarMap&, Support::Symbol);
-};
-
-}}
-
-#endif
-
-// STATISTICS: gist-any

data/ext/gecode-2.1.1/gecode/gist/shapelist.cc

@@ -1,331 +0,0 @@
-/*
- *  Main authors:
- *     Guido Tack <tack@gecode.org>
- *
- *  Copyright:
- *     Guido Tack, 2006
- *
- *  Last modified:
- *     $Date: 2007-12-04 12:51:49 +0100 (Tue, 04 Dec 2007) $ by $Author: tack $
- *     $Revision: 5571 $
- *
- *  This file is part of Gecode, the generic constraint
- *  development environment:
- *     http://www.gecode.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#include "gecode/gist/shapelist.hh"
-#include <iostream>
-#include <cassert>
-
-namespace Gecode { namespace Gist {
-  
-  BoundingBox::BoundingBox(int l, int r, int d) : left(l), right(r), depth(d) {}
-  
-  Extent::Extent(void) : l(-1), r(-1) {}
-
-  Extent::Extent(int l0, int r0) : l(l0), r(r0) {}
-
-  Extent::Extent(int width) {
-    int halfWidth = width / 2;
-    l = 0 - halfWidth;
-    r = 0 + halfWidth;
-  }
-  
-  void
-  Extent::extend(int deltaL, int deltaR) {
-    l += deltaL; r += deltaR;
-  }
-  
-  void
-  Extent::move(int delta) {
-    l += delta; r += delta;
-  }
-  
-  Shape::Shape(void) : shape(0) {}
-  
-  Shape::Shape(Extent e) : shape(1) { shape[0] = e; }
-  
-  Shape::Shape(Extent e, const Shape* subShape) {
-    shape.resize(subShape->depth() + 1);
-    shape[0] = e;
-
-    for (unsigned int i=0; i<subShape->shape.size(); i++) {
-      shape[i+1] = subShape->shape[i];
-    }
-    
-  }
-  
-  Shape::Shape(const Shape* subShape) {
-    shape.resize(subShape->depth());
-    for (unsigned int i=0; i<subShape->shape.size(); i++) {
-      shape[i] = subShape->shape[i];
-    }    
-  }
-  
-  int
-  Shape::depth(void) const { return shape.size(); }
-  
-  void
-  Shape::add(Extent e) {
-    unsigned int s = shape.size();
-    shape.push_back(e);
-    assert(shape.size() == s + 1);
-  }
-  
-  Extent
-  Shape::get(int i) {
-    return shape[i];
-  }
-  
-  void
-  Shape::extend(int deltaL, int deltaR) {
-    if (shape.size() > 0)
-      shape[0].extend(deltaL, deltaR);
-  }
-  
-  void
-  Shape::move(int delta) {
-    if (shape.size() > 0)
-      shape[0].move(delta);    
-  }
-
-  bool
-  Shape::getExtentAtDepth(int depth, Extent& extent) {
-    int currentDepth = 0;
-    int extentL = 0;
-    int extentR = 0;
-    for (unsigned int i=0; i<shape.size() && currentDepth <= depth; i++) {
-      Extent currentExtent = shape[i];
-      extentL += currentExtent.l;
-      extentR += currentExtent.r;
-      currentDepth++;
-    }
-    if (currentDepth == depth + 1) {
-      extent = Extent(extentL, extentR);
-      return true;
-    } else {
-      return false;
-    }  
-  }
-  
-  BoundingBox
-  Shape::getBoundingBox(void) {
-    int lastLeft = 0;
-    int lastRight = 0;
-    int left = 0;
-    int right = 0;
-    int depth = 0;
-    for (unsigned int i=0; i<shape.size(); i++) {
-      Extent curExtent = shape[i];
-      depth++;
-      lastLeft = lastLeft + curExtent.l;
-      lastRight = lastRight + curExtent.r;
-      if (lastLeft < left)
-        left = lastLeft;
-      if (lastRight > right)
-        right = lastRight;
-    }
-    return BoundingBox(left, right, depth);    
-  }
-  
-  
-  int
-  ShapeList::getAlpha(Shape* shape1, Shape* shape2) {
-    int alpha = minimalSeparation;
-    int extentR = 0;
-    int extentL = 0;
-    int depth1 = shape1->depth();
-    int depth2 = shape2->depth();
-    for (int i=0; i<depth1 && i<depth2; i++) {
-      extentR += shape1->get(i).r;
-      extentL += shape2->get(i).l;
-      alpha = std::max(alpha, extentR - extentL + minimalSeparation);
-    }
-    return alpha;
-  }
-  
-  Shape*
-  ShapeList::merge(Shape* shape1, Shape* shape2, int alpha) {
-    if (shape1->depth() == 0) {
-      return new Shape(shape2);
-    } else if (shape2->depth() == 0) {
-      return new Shape(shape1);
-    } else {
-      Shape* result = new Shape();
-        
-      // Extend the topmost right extent by alpha.  This, in effect,
-      // moves the second shape to the right by alpha units.
-      int topmostL = shape1->get(0).l;
-      int topmostR = shape2->get(0).r;
-      Extent topmostExtent(topmostL, topmostR);
-      topmostExtent.extend(0, alpha);
-      result->add(topmostExtent);
-        
-      // Now, since extents are given in relative units, in order to
-      // compute the extents of the merged shape, we can just collect the
-      // extents of shape1 and shape2, until one of the shapes ends.  If
-      // this happens, we need to "back-off" to the axis of the deeper
-      // shape in order to properly determine the remaining extents.
-      int backoffTo1 =
-        shape1->get(0).r - alpha - shape2->get(0).r;
-      int backoffTo2 =
-        shape2->get(0).l + alpha - shape1->get(0).l;
-      int i=1;
-      for (; i<shape1->depth() && i<shape2->depth(); i++) {
-        Extent currentExtent1 = shape1->get(i);
-        Extent currentExtent2 = shape2->get(i);
-        int newExtentL = currentExtent1.l;
-        int newExtentR = currentExtent2.r;
-        Extent newExtent(newExtentL, newExtentR);
-        result->add(newExtent);
-        backoffTo1 += currentExtent1.r - currentExtent2.r;
-        backoffTo2 += currentExtent2.l - currentExtent1.l;
-      }
-        
-      // If shape1 is deeper than shape2, back off to the axis of shape1,
-      // and process the remaining extents of shape1.
-      if (i<shape1->depth()) {
-        Extent currentExtent1 = shape1->get(i);
-        ++i;
-        int newExtentL = currentExtent1.l;
-        int newExtentR = currentExtent1.r;
-        Extent newExtent(newExtentL, newExtentR);
-        newExtent.extend(0, backoffTo1);
-        result->add(newExtent);
-        for (; i<shape1->depth(); i++) {
-          result->add(shape1->get(i));
-        }
-      }
-        
-      // Vice versa, if shape2 is deeper than shape1, back off to the
-      // axis of shape2, and process the remaining extents of shape2.
-      if (i<shape2->depth()) {
-        Extent currentExtent2 = shape2->get(i);
-        ++i;
-        int newExtentL = currentExtent2.l;
-        int newExtentR = currentExtent2.r;
-        Extent newExtent(newExtentL, newExtentR);
-        newExtent.extend(backoffTo2, 0);
-        result->add(newExtent);
-        for (; i<shape2->depth(); i++) {
-          result->add(shape2->get(i));
-        }
-      }
-        
-      return result;
-    }
-    
-  }
-  
-  Shape*
-  ShapeList::getMergedShape(bool left) {
-    int numberOfShapes = shapes.size();
-    if (numberOfShapes == 1) {
-      offsets[0] = 0;
-      return new Shape(shapes[0]);
-    } else {
-      Shape* mergedShape;
-      // alphaL[] and alphaR[] store the necessary distances between the
-      // axes of the shapes in the list: alphaL[i] gives the distance
-      // between shape[i] and shape[i-1], when shape[i-1] and shape[i]
-      // are merged left-to-right; alphaR[i] gives the distance between
-      // shape[i] and shape[i+1], when shape[i] and shape[i+1] are merged
-      // right-to-left.
-      std::vector<int> alphaL(numberOfShapes);
-      std::vector<int> alphaR(numberOfShapes);
-        
-      // distance between the leftmost and the rightmost axis in the list
-      int width = 0;
-        
-      Shape* currentShapeL = new Shape(shapes[0]);
-      Shape* currentShapeR = new Shape(shapes[numberOfShapes - 1]);
-
-      for (int i = 1; i < numberOfShapes; i++) {
-        // Merge left-to-right.  Note that due to the asymmetry of the
-        // merge operation, nextAlphaL is the distance between the
-        // *leftmost* axis in the shape list, and the axis of
-        // nextShapeL; what we are really interested in is the distance
-        // between the *previous* axis and the axis of nextShapeL.
-        // This explains the correction.
-
-        Shape* oldShapeL = currentShapeL;
-        Shape* oldShapeR = currentShapeR;
-
-        Shape* nextShapeL = shapes[i];
-        int nextAlphaL = getAlpha(currentShapeL, nextShapeL);
-        currentShapeL = merge(currentShapeL, nextShapeL, nextAlphaL);
-        delete oldShapeL;
-        alphaL[i] = nextAlphaL - width;
-        width = nextAlphaL;
-            
-        // Merge right-to-left.  Here, a correction of nextAlphaR is
-        // not required.
-        Shape* nextShapeR = shapes[numberOfShapes - 1 - i];
-        int nextAlphaR = getAlpha(nextShapeR, currentShapeR);
-        currentShapeR = merge(nextShapeR, currentShapeR, nextAlphaR);
-        delete oldShapeR;
-        alphaR[numberOfShapes - i] = nextAlphaR;
-      }
-        
-      // The merged shape for the shape list is the last shape from any
-      // of the merge directions; here, we pick currentShapeR.
-      mergedShape = currentShapeR;
-      delete currentShapeL;
-
-      // After the loop, the merged shape has the same axis as the
-      // leftmost shape in the list.  What we want is to move the axis
-      // such that it is the center of the axis of the leftmost shape in
-      // the list and the axis of the rightmost shape.
-      int halfWidth = left ? 0 : width / 2;
-      mergedShape->move(- halfWidth);
-        
-      // Finally, for the offset lists.  Now that the axis of the merged
-      // shape is at the center of the two extreme axes, the first shape
-      // needs to be offset by -halfWidth units with respect to the new
-      // axis.  As for the offsets for the other shapes, we take the
-      // median of the alphaL and alphaR values, as suggested in
-      // Kennedy's paper.
-      int offset = - halfWidth;
-      offsets.resize(numberOfShapes);
-      offsets[0] = offset;
-      for (int i = 1; i < numberOfShapes; i++) {
-        offset += (alphaL[i] + alphaR[i]) / 2;
-        offsets[i] = offset;
-      }
-      return mergedShape;
-    }
-  }
-
-  ShapeList::ShapeList(int length, int minSeparation)
-    : shapes(length), minimalSeparation(minSeparation), offsets(length) {}
-
-  Shape*&
-  ShapeList::operator[](int i) { return shapes[i]; }
-  
-  int
-  ShapeList::getOffsetOfChild(int i) { return offsets[i]; }
-  
-}}
-
-// STATISTICS: gist-any