update to trunk

(bzr r12588.1.32)

1 files changed, 0 insertions, 128 deletions

diff --git a/src/libvpsc/csolve_VPSC.cpp b/src/libvpsc/csolve_VPSC.cpp
deleted file mode 100644
index 60e88a50b..000000000
--- a/src/libvpsc/csolve_VPSC.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Bridge for C programs to access solve_VPSC (which is in C++).
- *
- * Authors:
- *   Tim Dwyer <tgdwyer@gmail.com>
- *
- * Copyright (C) 2005 Authors
- *
- * Released under GNU LGPL.  Read the file 'COPYING' for more information.
- */
-#include <glib.h>
-#include <iostream>
-#include <cassert>
-#include <cstdlib>
-#include "variable.h"
-#include "constraint.h"
-#include "generate-constraints.h"
-#include "solve_VPSC.h"
-#include "csolve_VPSC.h"
-using namespace vpsc;
-extern "C" {
-Variable* newVariable(int id, double desiredPos, double weight) {
-    return new Variable(id,desiredPos,weight);
-}
-Constraint* newConstraint(Variable* left, Variable* right, double gap) {
-    return new Constraint(left,right,gap);
-}
-Solver* newSolver(int n, Variable* vs[], int m, Constraint* cs[]) {
-    return new Solver(n,vs,m,cs);
-}
-Solver* newIncSolver(int n, Variable* vs[], int m, Constraint* cs[]) {
-    return (Solver*)new vpsc::IncSolver(n,vs,m,cs);
-}
-
-int genXConstraints(int n, boxf* bb, Variable** vs, Constraint*** cs,int transitiveClosure) {
-    Rectangle* rs[n];
-    for(int i=0;i<n;i++) {
-        rs[i]=new Rectangle(bb[i].LL.x,bb[i].UR.x,bb[i].LL.y,bb[i].UR.y);
-    }
-    int m = generateXConstraints(n,rs,vs,*cs,transitiveClosure);
-    for(int i=0;i<n;i++) {
-        delete rs[i];
-    }
-    return m;
-}
-int genYConstraints(int n, boxf* bb, Variable** vs, Constraint*** cs) {
-    g_assert(n > 0);
-    Rectangle* rs[n];
-    for(int i=0;i<n;i++) {
-        rs[i]=new Rectangle(bb[i].LL.x,bb[i].UR.x,bb[i].LL.y,bb[i].UR.y);
-    }
-    int m = generateYConstraints(n,rs,vs,*cs);
-    for(int i=0;i<n;i++) {
-        delete rs[i];
-    }
-    return m;
-}
-
-Constraint** newConstraints(int m) {
-    return new Constraint*[m];
-}
-void deleteConstraints(int m, Constraint **cs) {
-    for(int i=0;i<m;i++) {
-        delete cs[i];
-    }
-    delete [] cs;
-}
-void deleteConstraint(Constraint* c) {
-    delete c;
-}
-void deleteVariable(Variable* v) {
-    delete v;
-}
-void satisfyVPSC(Solver* vpsc) {
-    try {
-        vpsc->satisfy();
-    } catch(const char *e) {
-        std::cerr << e << std::endl;
-        exit(1);
-    }
-}
-int getSplitCnt(IncSolver *vpsc) {
-    return vpsc->splitCnt;
-}
-void deleteVPSC(Solver *vpsc) {
-    assert(vpsc!=NULL);
-    delete vpsc;
-}
-void solveVPSC(Solver* vpsc) {
-    vpsc->solve();
-}
-void splitIncVPSC(IncSolver* vpsc) {
-    vpsc->splitBlocks();
-}
-void setVariableDesiredPos(Variable *v, double desiredPos) {
-    v->desiredPosition = desiredPos;
-}
-double getVariablePos(Variable *v) {
-    return v->position();
-}
-void remapInConstraints(Variable *u, Variable *v, double dgap) {
-    for(Constraints::iterator i=u->in.begin();i!=u->in.end();i++) {
-        Constraint* c=*i;    
-        c->right=v;
-        c->gap+=dgap;
-        v->in.push_back(c);
-    }
-    u->in.clear();
-}
-void remapOutConstraints(Variable *u, Variable *v, double dgap) {
-    for(Constraints::iterator i=u->out.begin();i!=u->out.end();i++) {
-        Constraint* c=*i;    
-        c->left=v;
-        c->gap+=dgap;
-        v->out.push_back(c);
-    }
-    u->out.clear();
-}
-int getLeftVarID(Constraint *c) {
-    return c->left->id;
-}
-int getRightVarID(Constraint *c){
-    return c->right->id;
-}
-double getSeparation(Constraint *c){
-    return c->gap;
-}
-}