split fmin code to a separate library

index.js

@@ -1,4 +1,3 @@
-export {fmin, minimizeConjugateGradient, bisect} from "./src/fmin";
 export {intersectionArea, circleCircleIntersection, circleOverlap, circleArea,
         distance, circleIntegral} from "./src/circleintersection";
 export {venn, greedyLayout, scaleSolution, normalizeSolution, bestInitialLayout,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "venn.js",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "author": "Ben Frederickson <[email protected]> (http:/www.benfrederickson.com)",
   "url": "https://github.com/benfred/venn.js/issues",
   "devDependencies": {
@@ -44,6 +44,7 @@
     "postpublish": "zip -j build/venn.zip -- LICENSE README.md build/venn.js build/venn.min.js"
   },
   "dependencies": {
+    "fmin": "0.0.2",
     "d3-selection": "^1.0.2",
     "d3-transition": "^1.0.1"
   }

src/diagram.js

@@ -3,7 +3,7 @@ import {transition} from "d3-transition";
 
 import {venn, normalizeSolution, scaleSolution} from "./layout";
 import {intersectionArea, distance, getCenter} from "./circleintersection";
-import {fmin} from "./fmin";
+import {nelderMead} from "../node_modules/fmin/index.js";
 
 /*global console:true*/
 
@@ -363,10 +363,10 @@ export function computeTextCentre(interior, exterior) {
     }
 
     // maximize the margin numerically
-    var solution = fmin(
+    var solution = nelderMead(
                 function(p) { return -1 * circleMargin({x: p[0], y: p[1]}, interior, exterior); },
                 [initial.x, initial.y],
-                {maxIterations:500, minErrorDelta:1e-10}).solution;
+                {maxIterations:500, minErrorDelta:1e-10}).x;
     var ret = {x: solution[0], y: solution[1]};
 
     // check solution, fallback as needed (happens if fully overlapped