diff --git a/.gitattributes b/.gitattributes
index f19c7a9e9be6a..eab783da7bee0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1 @@
 d3.js -diff merge=ours
-d3.min.js -diff merge=ours
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5ced343e04b26..89a33e2da0b92 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,7 +18,7 @@ To contribute new documentation or add examples to the gallery, just [edit the W
 
 3. Create a new branch for your new feature. For example: `git checkout -b my-awesome-feature`. A dedicated branch for your pull request means you can develop multiple features at the same time, and ensures that your pull request is stable even if you later decide to develop an unrelated feature.
 
-4. The `d3.js` and `d3.min.js` files are built from source files in the `src` directory. _Do not edit `d3.js` directly._ Instead, edit the source files, and then run `make` to build the generated files.
+4. The `d3.js` file is built from source files in the `src` directory. _Do not edit `d3.js` directly._ Instead, edit the source files, and then run `make` to build the generated files.
 
 5. Use `make test` to run tests and verify your changes. If you are adding a new feature, you should add new tests! If you are changing existing functionality, make sure the existing tests run, or update them as appropriate.
 
diff --git a/d3.js b/d3.js
index 431d012417b6c..6ef106d726986 100644
--- a/d3.js
+++ b/d3.js
@@ -5,7 +5,7 @@
   var d3_arraySlice = [].slice, d3_array = function(list) {
     return d3_arraySlice.call(list);
   };
-  var d3_document = this.document;
+  var d3_document = self.document;
   function d3_documentElement(node) {
     return node && (node.ownerDocument || node.document || node).documentElement;
   }
@@ -2186,672 +2186,9 @@
     d3_timer_queueTail = t0;
     return time;
   }
-  function d3_format_precision(x, p) {
-    return p - (x ? Math.ceil(Math.log(x) / Math.LN10) : 1);
-  }
   d3.round = function(x, n) {
     return n ? Math.round(x * (n = Math.pow(10, n))) / n : Math.round(x);
   };
-  var d3_formatPrefixes = [ "y", "z", "a", "f", "p", "n", "µ", "m", "", "k", "M", "G", "T", "P", "E", "Z", "Y" ].map(d3_formatPrefix);
-  d3.formatPrefix = function(value, precision) {
-    var i = 0;
-    if (value = +value) {
-      if (value < 0) value *= -1;
-      if (precision) value = d3.round(value, d3_format_precision(value, precision));
-      i = 1 + Math.floor(1e-12 + Math.log(value) / Math.LN10);
-      i = Math.max(-24, Math.min(24, Math.floor((i - 1) / 3) * 3));
-    }
-    return d3_formatPrefixes[8 + i / 3];
-  };
-  function d3_formatPrefix(d, i) {
-    var k = Math.pow(10, abs(8 - i) * 3);
-    return {
-      scale: i > 8 ? function(d) {
-        return d / k;
-      } : function(d) {
-        return d * k;
-      },
-      symbol: d
-    };
-  }
-  function d3_locale_numberFormat(locale) {
-    var locale_decimal = locale.decimal, locale_thousands = locale.thousands, locale_grouping = locale.grouping, locale_currency = locale.currency, formatGroup = locale_grouping && locale_thousands ? function(value, width) {
-      var i = value.length, t = [], j = 0, g = locale_grouping[0], length = 0;
-      while (i > 0 && g > 0) {
-        if (length + g + 1 > width) g = Math.max(1, width - length);
-        t.push(value.substring(i -= g, i + g));
-        if ((length += g + 1) > width) break;
-        g = locale_grouping[j = (j + 1) % locale_grouping.length];
-      }
-      return t.reverse().join(locale_thousands);
-    } : d3_identity;
-    return function(specifier) {
-      var match = d3_format_re.exec(specifier), fill = match[1] || " ", align = match[2] || ">", sign = match[3] || "-", symbol = match[4] || "", zfill = match[5], width = +match[6], comma = match[7], precision = match[8], type = match[9], scale = 1, prefix = "", suffix = "", integer = false, exponent = true;
-      if (precision) precision = +precision.substring(1);
-      if (zfill || fill === "0" && align === "=") {
-        zfill = fill = "0";
-        align = "=";
-      }
-      switch (type) {
-       case "n":
-        comma = true;
-        type = "g";
-        break;
-
-       case "%":
-        scale = 100;
-        suffix = "%";
-        type = "f";
-        break;
-
-       case "p":
-        scale = 100;
-        suffix = "%";
-        type = "r";
-        break;
-
-       case "b":
-       case "o":
-       case "x":
-       case "X":
-        if (symbol === "#") prefix = "0" + type.toLowerCase();
-
-       case "c":
-        exponent = false;
-
-       case "d":
-        integer = true;
-        precision = 0;
-        break;
-
-       case "s":
-        scale = -1;
-        type = "r";
-        break;
-      }
-      if (symbol === "$") prefix = locale_currency[0], suffix = locale_currency[1];
-      if (type == "r" && !precision) type = "g";
-      if (precision != null) {
-        if (type == "g") precision = Math.max(1, Math.min(21, precision)); else if (type == "e" || type == "f") precision = Math.max(0, Math.min(20, precision));
-      }
-      type = d3_format_types.get(type) || d3_format_typeDefault;
-      var zcomma = zfill && comma;
-      return function(value) {
-        var fullSuffix = suffix;
-        if (integer && value % 1) return "";
-        var negative = value < 0 || value === 0 && 1 / value < 0 ? (value = -value, "-") : sign === "-" ? "" : sign;
-        if (scale < 0) {
-          var unit = d3.formatPrefix(value, precision);
-          value = unit.scale(value);
-          fullSuffix = unit.symbol + suffix;
-        } else {
-          value *= scale;
-        }
-        value = type(value, precision);
-        var i = value.lastIndexOf("."), before, after;
-        if (i < 0) {
-          var j = exponent ? value.lastIndexOf("e") : -1;
-          if (j < 0) before = value, after = ""; else before = value.substring(0, j), after = value.substring(j);
-        } else {
-          before = value.substring(0, i);
-          after = locale_decimal + value.substring(i + 1);
-        }
-        if (!zfill && comma) before = formatGroup(before, Infinity);
-        var length = prefix.length + before.length + after.length + (zcomma ? 0 : negative.length), padding = length < width ? new Array(length = width - length + 1).join(fill) : "";
-        if (zcomma) before = formatGroup(padding + before, padding.length ? width - after.length : Infinity);
-        negative += prefix;
-        value = before + after;
-        return (align === "<" ? negative + value + padding : align === ">" ? padding + negative + value : align === "^" ? padding.substring(0, length >>= 1) + negative + value + padding.substring(length) : negative + (zcomma ? value : padding + value)) + fullSuffix;
-      };
-    };
-  }
-  var d3_format_re = /(?:([^{])?([<>=^]))?([+\- ])?([$#])?(0)?(\d+)?(,)?(\.-?\d+)?([a-z%])?/i;
-  var d3_format_types = d3.map({
-    b: function(x) {
-      return x.toString(2);
-    },
-    c: function(x) {
-      return String.fromCharCode(x);
-    },
-    o: function(x) {
-      return x.toString(8);
-    },
-    x: function(x) {
-      return x.toString(16);
-    },
-    X: function(x) {
-      return x.toString(16).toUpperCase();
-    },
-    g: function(x, p) {
-      return x.toPrecision(p);
-    },
-    e: function(x, p) {
-      return x.toExponential(p);
-    },
-    f: function(x, p) {
-      return x.toFixed(p);
-    },
-    r: function(x, p) {
-      return (x = d3.round(x, d3_format_precision(x, p))).toFixed(Math.max(0, Math.min(20, d3_format_precision(x * (1 + 1e-15), p))));
-    }
-  });
-  function d3_format_typeDefault(x) {
-    return x + "";
-  }
-  var d3_time = d3.time = {}, d3_date = Date;
-  function d3_date_utc() {
-    this._ = new Date(arguments.length > 1 ? Date.UTC.apply(this, arguments) : arguments[0]);
-  }
-  d3_date_utc.prototype = {
-    getDate: function() {
-      return this._.getUTCDate();
-    },
-    getDay: function() {
-      return this._.getUTCDay();
-    },
-    getFullYear: function() {
-      return this._.getUTCFullYear();
-    },
-    getHours: function() {
-      return this._.getUTCHours();
-    },
-    getMilliseconds: function() {
-      return this._.getUTCMilliseconds();
-    },
-    getMinutes: function() {
-      return this._.getUTCMinutes();
-    },
-    getMonth: function() {
-      return this._.getUTCMonth();
-    },
-    getSeconds: function() {
-      return this._.getUTCSeconds();
-    },
-    getTime: function() {
-      return this._.getTime();
-    },
-    getTimezoneOffset: function() {
-      return 0;
-    },
-    valueOf: function() {
-      return this._.valueOf();
-    },
-    setDate: function() {
-      d3_time_prototype.setUTCDate.apply(this._, arguments);
-    },
-    setDay: function() {
-      d3_time_prototype.setUTCDay.apply(this._, arguments);
-    },
-    setFullYear: function() {
-      d3_time_prototype.setUTCFullYear.apply(this._, arguments);
-    },
-    setHours: function() {
-      d3_time_prototype.setUTCHours.apply(this._, arguments);
-    },
-    setMilliseconds: function() {
-      d3_time_prototype.setUTCMilliseconds.apply(this._, arguments);
-    },
-    setMinutes: function() {
-      d3_time_prototype.setUTCMinutes.apply(this._, arguments);
-    },
-    setMonth: function() {
-      d3_time_prototype.setUTCMonth.apply(this._, arguments);
-    },
-    setSeconds: function() {
-      d3_time_prototype.setUTCSeconds.apply(this._, arguments);
-    },
-    setTime: function() {
-      d3_time_prototype.setTime.apply(this._, arguments);
-    }
-  };
-  var d3_time_prototype = Date.prototype;
-  function d3_time_interval(local, step, number) {
-    function round(date) {
-      var d0 = local(date), d1 = offset(d0, 1);
-      return date - d0 < d1 - date ? d0 : d1;
-    }
-    function ceil(date) {
-      step(date = local(new d3_date(date - 1)), 1);
-      return date;
-    }
-    function offset(date, k) {
-      step(date = new d3_date(+date), k);
-      return date;
-    }
-    function range(t0, t1, dt) {
-      var time = ceil(t0), times = [];
-      if (dt > 1) {
-        while (time < t1) {
-          if (!(number(time) % dt)) times.push(new Date(+time));
-          step(time, 1);
-        }
-      } else {
-        while (time < t1) times.push(new Date(+time)), step(time, 1);
-      }
-      return times;
-    }
-    function range_utc(t0, t1, dt) {
-      try {
-        d3_date = d3_date_utc;
-        var utc = new d3_date_utc();
-        utc._ = t0;
-        return range(utc, t1, dt);
-      } finally {
-        d3_date = Date;
-      }
-    }
-    local.floor = local;
-    local.round = round;
-    local.ceil = ceil;
-    local.offset = offset;
-    local.range = range;
-    var utc = local.utc = d3_time_interval_utc(local);
-    utc.floor = utc;
-    utc.round = d3_time_interval_utc(round);
-    utc.ceil = d3_time_interval_utc(ceil);
-    utc.offset = d3_time_interval_utc(offset);
-    utc.range = range_utc;
-    return local;
-  }
-  function d3_time_interval_utc(method) {
-    return function(date, k) {
-      try {
-        d3_date = d3_date_utc;
-        var utc = new d3_date_utc();
-        utc._ = date;
-        return method(utc, k)._;
-      } finally {
-        d3_date = Date;
-      }
-    };
-  }
-  d3_time.year = d3_time_interval(function(date) {
-    date = d3_time.day(date);
-    date.setMonth(0, 1);
-    return date;
-  }, function(date, offset) {
-    date.setFullYear(date.getFullYear() + offset);
-  }, function(date) {
-    return date.getFullYear();
-  });
-  d3_time.years = d3_time.year.range;
-  d3_time.years.utc = d3_time.year.utc.range;
-  d3_time.day = d3_time_interval(function(date) {
-    var day = new d3_date(2e3, 0);
-    day.setFullYear(date.getFullYear(), date.getMonth(), date.getDate());
-    return day;
-  }, function(date, offset) {
-    date.setDate(date.getDate() + offset);
-  }, function(date) {
-    return date.getDate() - 1;
-  });
-  d3_time.days = d3_time.day.range;
-  d3_time.days.utc = d3_time.day.utc.range;
-  d3_time.dayOfYear = function(date) {
-    var year = d3_time.year(date);
-    return Math.floor((date - year - (date.getTimezoneOffset() - year.getTimezoneOffset()) * 6e4) / 864e5);
-  };
-  [ "sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday" ].forEach(function(day, i) {
-    i = 7 - i;
-    var interval = d3_time[day] = d3_time_interval(function(date) {
-      (date = d3_time.day(date)).setDate(date.getDate() - (date.getDay() + i) % 7);
-      return date;
-    }, function(date, offset) {
-      date.setDate(date.getDate() + Math.floor(offset) * 7);
-    }, function(date) {
-      var day = d3_time.year(date).getDay();
-      return Math.floor((d3_time.dayOfYear(date) + (day + i) % 7) / 7) - (day !== i);
-    });
-    d3_time[day + "s"] = interval.range;
-    d3_time[day + "s"].utc = interval.utc.range;
-    d3_time[day + "OfYear"] = function(date) {
-      var day = d3_time.year(date).getDay();
-      return Math.floor((d3_time.dayOfYear(date) + (day + i) % 7) / 7);
-    };
-  });
-  d3_time.week = d3_time.sunday;
-  d3_time.weeks = d3_time.sunday.range;
-  d3_time.weeks.utc = d3_time.sunday.utc.range;
-  d3_time.weekOfYear = d3_time.sundayOfYear;
-  function d3_locale_timeFormat(locale) {
-    var locale_dateTime = locale.dateTime, locale_date = locale.date, locale_time = locale.time, locale_periods = locale.periods, locale_days = locale.days, locale_shortDays = locale.shortDays, locale_months = locale.months, locale_shortMonths = locale.shortMonths;
-    function d3_time_format(template) {
-      var n = template.length;
-      function format(date) {
-        var string = [], i = -1, j = 0, c, p, f;
-        while (++i < n) {
-          if (template.charCodeAt(i) === 37) {
-            string.push(template.slice(j, i));
-            if ((p = d3_time_formatPads[c = template.charAt(++i)]) != null) c = template.charAt(++i);
-            if (f = d3_time_formats[c]) c = f(date, p == null ? c === "e" ? " " : "0" : p);
-            string.push(c);
-            j = i + 1;
-          }
-        }
-        string.push(template.slice(j, i));
-        return string.join("");
-      }
-      format.parse = function(string) {
-        var d = {
-          y: 1900,
-          m: 0,
-          d: 1,
-          H: 0,
-          M: 0,
-          S: 0,
-          L: 0,
-          Z: null
-        }, i = d3_time_parse(d, template, string, 0);
-        if (i != string.length) return null;
-        if ("p" in d) d.H = d.H % 12 + d.p * 12;
-        var localZ = d.Z != null && d3_date !== d3_date_utc, date = new (localZ ? d3_date_utc : d3_date)();
-        if ("j" in d) date.setFullYear(d.y, 0, d.j); else if ("W" in d || "U" in d) {
-          if (!("w" in d)) d.w = "W" in d ? 1 : 0;
-          date.setFullYear(d.y, 0, 1);
-          date.setFullYear(d.y, 0, "W" in d ? (d.w + 6) % 7 + d.W * 7 - (date.getDay() + 5) % 7 : d.w + d.U * 7 - (date.getDay() + 6) % 7);
-        } else date.setFullYear(d.y, d.m, d.d);
-        date.setHours(d.H + (d.Z / 100 | 0), d.M + d.Z % 100, d.S, d.L);
-        return localZ ? date._ : date;
-      };
-      format.toString = function() {
-        return template;
-      };
-      return format;
-    }
-    function d3_time_parse(date, template, string, j) {
-      var c, p, t, i = 0, n = template.length, m = string.length;
-      while (i < n) {
-        if (j >= m) return -1;
-        c = template.charCodeAt(i++);
-        if (c === 37) {
-          t = template.charAt(i++);
-          p = d3_time_parsers[t in d3_time_formatPads ? template.charAt(i++) : t];
-          if (!p || (j = p(date, string, j)) < 0) return -1;
-        } else if (c != string.charCodeAt(j++)) {
-          return -1;
-        }
-      }
-      return j;
-    }
-    d3_time_format.utc = function(template) {
-      var local = d3_time_format(template);
-      function format(date) {
-        try {
-          d3_date = d3_date_utc;
-          var utc = new d3_date();
-          utc._ = date;
-          return local(utc);
-        } finally {
-          d3_date = Date;
-        }
-      }
-      format.parse = function(string) {
-        try {
-          d3_date = d3_date_utc;
-          var date = local.parse(string);
-          return date && date._;
-        } finally {
-          d3_date = Date;
-        }
-      };
-      format.toString = local.toString;
-      return format;
-    };
-    d3_time_format.multi = d3_time_format.utc.multi = d3_time_formatMulti;
-    var d3_time_periodLookup = d3.map(), d3_time_dayRe = d3_time_formatRe(locale_days), d3_time_dayLookup = d3_time_formatLookup(locale_days), d3_time_dayAbbrevRe = d3_time_formatRe(locale_shortDays), d3_time_dayAbbrevLookup = d3_time_formatLookup(locale_shortDays), d3_time_monthRe = d3_time_formatRe(locale_months), d3_time_monthLookup = d3_time_formatLookup(locale_months), d3_time_monthAbbrevRe = d3_time_formatRe(locale_shortMonths), d3_time_monthAbbrevLookup = d3_time_formatLookup(locale_shortMonths);
-    locale_periods.forEach(function(p, i) {
-      d3_time_periodLookup.set(p.toLowerCase(), i);
-    });
-    var d3_time_formats = {
-      a: function(d) {
-        return locale_shortDays[d.getDay()];
-      },
-      A: function(d) {
-        return locale_days[d.getDay()];
-      },
-      b: function(d) {
-        return locale_shortMonths[d.getMonth()];
-      },
-      B: function(d) {
-        return locale_months[d.getMonth()];
-      },
-      c: d3_time_format(locale_dateTime),
-      d: function(d, p) {
-        return d3_time_formatPad(d.getDate(), p, 2);
-      },
-      e: function(d, p) {
-        return d3_time_formatPad(d.getDate(), p, 2);
-      },
-      H: function(d, p) {
-        return d3_time_formatPad(d.getHours(), p, 2);
-      },
-      I: function(d, p) {
-        return d3_time_formatPad(d.getHours() % 12 || 12, p, 2);
-      },
-      j: function(d, p) {
-        return d3_time_formatPad(1 + d3_time.dayOfYear(d), p, 3);
-      },
-      L: function(d, p) {
-        return d3_time_formatPad(d.getMilliseconds(), p, 3);
-      },
-      m: function(d, p) {
-        return d3_time_formatPad(d.getMonth() + 1, p, 2);
-      },
-      M: function(d, p) {
-        return d3_time_formatPad(d.getMinutes(), p, 2);
-      },
-      p: function(d) {
-        return locale_periods[+(d.getHours() >= 12)];
-      },
-      S: function(d, p) {
-        return d3_time_formatPad(d.getSeconds(), p, 2);
-      },
-      U: function(d, p) {
-        return d3_time_formatPad(d3_time.sundayOfYear(d), p, 2);
-      },
-      w: function(d) {
-        return d.getDay();
-      },
-      W: function(d, p) {
-        return d3_time_formatPad(d3_time.mondayOfYear(d), p, 2);
-      },
-      x: d3_time_format(locale_date),
-      X: d3_time_format(locale_time),
-      y: function(d, p) {
-        return d3_time_formatPad(d.getFullYear() % 100, p, 2);
-      },
-      Y: function(d, p) {
-        return d3_time_formatPad(d.getFullYear() % 1e4, p, 4);
-      },
-      Z: d3_time_zone,
-      "%": function() {
-        return "%";
-      }
-    };
-    var d3_time_parsers = {
-      a: d3_time_parseWeekdayAbbrev,
-      A: d3_time_parseWeekday,
-      b: d3_time_parseMonthAbbrev,
-      B: d3_time_parseMonth,
-      c: d3_time_parseLocaleFull,
-      d: d3_time_parseDay,
-      e: d3_time_parseDay,
-      H: d3_time_parseHour24,
-      I: d3_time_parseHour24,
-      j: d3_time_parseDayOfYear,
-      L: d3_time_parseMilliseconds,
-      m: d3_time_parseMonthNumber,
-      M: d3_time_parseMinutes,
-      p: d3_time_parseAmPm,
-      S: d3_time_parseSeconds,
-      U: d3_time_parseWeekNumberSunday,
-      w: d3_time_parseWeekdayNumber,
-      W: d3_time_parseWeekNumberMonday,
-      x: d3_time_parseLocaleDate,
-      X: d3_time_parseLocaleTime,
-      y: d3_time_parseYear,
-      Y: d3_time_parseFullYear,
-      Z: d3_time_parseZone,
-      "%": d3_time_parseLiteralPercent
-    };
-    function d3_time_parseWeekdayAbbrev(date, string, i) {
-      d3_time_dayAbbrevRe.lastIndex = 0;
-      var n = d3_time_dayAbbrevRe.exec(string.slice(i));
-      return n ? (date.w = d3_time_dayAbbrevLookup.get(n[0].toLowerCase()), i + n[0].length) : -1;
-    }
-    function d3_time_parseWeekday(date, string, i) {
-      d3_time_dayRe.lastIndex = 0;
-      var n = d3_time_dayRe.exec(string.slice(i));
-      return n ? (date.w = d3_time_dayLookup.get(n[0].toLowerCase()), i + n[0].length) : -1;
-    }
-    function d3_time_parseMonthAbbrev(date, string, i) {
-      d3_time_monthAbbrevRe.lastIndex = 0;
-      var n = d3_time_monthAbbrevRe.exec(string.slice(i));
-      return n ? (date.m = d3_time_monthAbbrevLookup.get(n[0].toLowerCase()), i + n[0].length) : -1;
-    }
-    function d3_time_parseMonth(date, string, i) {
-      d3_time_monthRe.lastIndex = 0;
-      var n = d3_time_monthRe.exec(string.slice(i));
-      return n ? (date.m = d3_time_monthLookup.get(n[0].toLowerCase()), i + n[0].length) : -1;
-    }
-    function d3_time_parseLocaleFull(date, string, i) {
-      return d3_time_parse(date, d3_time_formats.c.toString(), string, i);
-    }
-    function d3_time_parseLocaleDate(date, string, i) {
-      return d3_time_parse(date, d3_time_formats.x.toString(), string, i);
-    }
-    function d3_time_parseLocaleTime(date, string, i) {
-      return d3_time_parse(date, d3_time_formats.X.toString(), string, i);
-    }
-    function d3_time_parseAmPm(date, string, i) {
-      var n = d3_time_periodLookup.get(string.slice(i, i += 2).toLowerCase());
-      return n == null ? -1 : (date.p = n, i);
-    }
-    return d3_time_format;
-  }
-  var d3_time_formatPads = {
-    "-": "",
-    _: " ",
-    "0": "0"
-  }, d3_time_numberRe = /^\s*\d+/, d3_time_percentRe = /^%/;
-  function d3_time_formatPad(value, fill, width) {
-    var sign = value < 0 ? "-" : "", string = (sign ? -value : value) + "", length = string.length;
-    return sign + (length < width ? new Array(width - length + 1).join(fill) + string : string);
-  }
-  function d3_time_formatRe(names) {
-    return new RegExp("^(?:" + names.map(d3.requote).join("|") + ")", "i");
-  }
-  function d3_time_formatLookup(names) {
-    var map = new d3_Map(), i = -1, n = names.length;
-    while (++i < n) map.set(names[i].toLowerCase(), i);
-    return map;
-  }
-  function d3_time_parseWeekdayNumber(date, string, i) {
-    d3_time_numberRe.lastIndex = 0;
-    var n = d3_time_numberRe.exec(string.slice(i, i + 1));
-    return n ? (date.w = +n[0], i + n[0].length) : -1;
-  }
-  function d3_time_parseWeekNumberSunday(date, string, i) {
-    d3_time_numberRe.lastIndex = 0;
-    var n = d3_time_numberRe.exec(string.slice(i));
-    return n ? (date.U = +n[0], i + n[0].length) : -1;
-  }
-  function d3_time_parseWeekNumberMonday(date, string, i) {
-    d3_time_numberRe.lastIndex = 0;
-    var n = d3_time_numberRe.exec(string.slice(i));
-    return n ? (date.W = +n[0], i + n[0].length) : -1;
-  }
-  function d3_time_parseFullYear(date, string, i) {
-    d3_time_numberRe.lastIndex = 0;
-    var n = d3_time_numberRe.exec(string.slice(i, i + 4));
-    return n ? (date.y = +n[0], i + n[0].length) : -1;
-  }
-  function d3_time_parseYear(date, string, i) {
-    d3_time_numberRe.lastIndex = 0;
-    var n = d3_time_numberRe.exec(string.slice(i, i + 2));
-    return n ? (date.y = d3_time_expandYear(+n[0]), i + n[0].length) : -1;
-  }
-  function d3_time_parseZone(date, string, i) {
-    return /^[+-]\d{4}$/.test(string = string.slice(i, i + 5)) ? (date.Z = -string, 
-    i + 5) : -1;
-  }
-  function d3_time_expandYear(d) {
-    return d + (d > 68 ? 1900 : 2e3);
-  }
-  function d3_time_parseMonthNumber(date, string, i) {
-    d3_time_numberRe.lastIndex = 0;
-    var n = d3_time_numberRe.exec(string.slice(i, i + 2));
-    return n ? (date.m = n[0] - 1, i + n[0].length) : -1;
-  }
-  function d3_time_parseDay(date, string, i) {
-    d3_time_numberRe.lastIndex = 0;
-    var n = d3_time_numberRe.exec(string.slice(i, i + 2));
-    return n ? (date.d = +n[0], i + n[0].length) : -1;
-  }
-  function d3_time_parseDayOfYear(date, string, i) {
-    d3_time_numberRe.lastIndex = 0;
-    var n = d3_time_numberRe.exec(string.slice(i, i + 3));
-    return n ? (date.j = +n[0], i + n[0].length) : -1;
-  }
-  function d3_time_parseHour24(date, string, i) {
-    d3_time_numberRe.lastIndex = 0;
-    var n = d3_time_numberRe.exec(string.slice(i, i + 2));
-    return n ? (date.H = +n[0], i + n[0].length) : -1;
-  }
-  function d3_time_parseMinutes(date, string, i) {
-    d3_time_numberRe.lastIndex = 0;
-    var n = d3_time_numberRe.exec(string.slice(i, i + 2));
-    return n ? (date.M = +n[0], i + n[0].length) : -1;
-  }
-  function d3_time_parseSeconds(date, string, i) {
-    d3_time_numberRe.lastIndex = 0;
-    var n = d3_time_numberRe.exec(string.slice(i, i + 2));
-    return n ? (date.S = +n[0], i + n[0].length) : -1;
-  }
-  function d3_time_parseMilliseconds(date, string, i) {
-    d3_time_numberRe.lastIndex = 0;
-    var n = d3_time_numberRe.exec(string.slice(i, i + 3));
-    return n ? (date.L = +n[0], i + n[0].length) : -1;
-  }
-  function d3_time_zone(d) {
-    var z = d.getTimezoneOffset(), zs = z > 0 ? "-" : "+", zh = abs(z) / 60 | 0, zm = abs(z) % 60;
-    return zs + d3_time_formatPad(zh, "0", 2) + d3_time_formatPad(zm, "0", 2);
-  }
-  function d3_time_parseLiteralPercent(date, string, i) {
-    d3_time_percentRe.lastIndex = 0;
-    var n = d3_time_percentRe.exec(string.slice(i, i + 1));
-    return n ? i + n[0].length : -1;
-  }
-  function d3_time_formatMulti(formats) {
-    var n = formats.length, i = -1;
-    while (++i < n) formats[i][0] = this(formats[i][0]);
-    return function(date) {
-      var i = 0, f = formats[i];
-      while (!f[1](date)) f = formats[++i];
-      return f[0](date);
-    };
-  }
-  d3.locale = function(locale) {
-    return {
-      numberFormat: d3_locale_numberFormat(locale),
-      timeFormat: d3_locale_timeFormat(locale)
-    };
-  };
-  var d3_locale_enUS = d3.locale({
-    decimal: ".",
-    thousands: ",",
-    grouping: [ 3 ],
-    currency: [ "$", "" ],
-    dateTime: "%a %b %e %X %Y",
-    date: "%m/%d/%Y",
-    time: "%H:%M:%S",
-    periods: [ "AM", "PM" ],
-    days: [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ],
-    shortDays: [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ],
-    months: [ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" ],
-    shortMonths: [ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" ]
-  });
-  d3.format = d3_locale_enUS.numberFormat;
   d3.geom = {};
   function d3_geom_pointX(d) {
     return d[0];
@@ -5694,27 +5031,6 @@
   function d3_scale_linearTicks(domain, m) {
     return d3.range.apply(d3, d3_scale_linearTickRange(domain, m));
   }
-  function d3_scale_linearTickFormat(domain, m, format) {
-    var range = d3_scale_linearTickRange(domain, m);
-    if (format) {
-      var match = d3_format_re.exec(format);
-      match.shift();
-      if (match[8] === "s") {
-        var prefix = d3.formatPrefix(Math.max(abs(range[0]), abs(range[1])));
-        if (!match[7]) match[7] = "." + d3_scale_linearPrecision(prefix.scale(range[2]));
-        match[8] = "f";
-        format = d3.format(match.join(""));
-        return function(d) {
-          return format(prefix.scale(d)) + prefix.symbol;
-        };
-      }
-      if (!match[7]) match[7] = "." + d3_scale_linearFormatPrecision(match[8], range);
-      format = match.join("");
-    } else {
-      format = ",." + d3_scale_linearPrecision(range[2]) + "f";
-    }
-    return d3.format(format);
-  }
   var d3_scale_linearFormatSignificant = {
     s: 1,
     g: 1,
@@ -5779,22 +5095,12 @@
       }
       return ticks;
     };
-    scale.tickFormat = function(n, format) {
-      if (!arguments.length) return d3_scale_logFormat;
-      if (arguments.length < 2) format = d3_scale_logFormat; else if (typeof format !== "function") format = d3.format(format);
-      var k = Math.max(1, base * n / scale.ticks().length);
-      return function(d) {
-        var i = d / pow(Math.round(log(d)));
-        if (i * base < base - .5) i *= base;
-        return i <= k ? format(d) : "";
-      };
-    };
     scale.copy = function() {
       return d3_scale_log(linear.copy(), base, positive, domain);
     };
     return d3_scale_linearRebind(scale, linear);
   }
-  var d3_scale_logFormat = d3.format(".0e"), d3_scale_logNiceNegative = {
+  var d3_scale_logNiceNegative = {
     floor: function(x) {
       return -Math.ceil(-x);
     },
@@ -7497,160 +6803,6 @@
     sw: "nesw-resize"
   };
   var d3_svg_brushResizes = [ [ "n", "e", "s", "w", "nw", "ne", "se", "sw" ], [ "e", "w" ], [ "n", "s" ], [] ];
-  var d3_time_format = d3_time.format = d3_locale_enUS.timeFormat;
-  var d3_time_formatUtc = d3_time_format.utc;
-  var d3_time_formatIso = d3_time_formatUtc("%Y-%m-%dT%H:%M:%S.%LZ");
-  d3_time_format.iso = Date.prototype.toISOString && +new Date("2000-01-01T00:00:00.000Z") ? d3_time_formatIsoNative : d3_time_formatIso;
-  function d3_time_formatIsoNative(date) {
-    return date.toISOString();
-  }
-  d3_time_formatIsoNative.parse = function(string) {
-    var date = new Date(string);
-    return isNaN(date) ? null : date;
-  };
-  d3_time_formatIsoNative.toString = d3_time_formatIso.toString;
-  d3_time.second = d3_time_interval(function(date) {
-    return new d3_date(Math.floor(date / 1e3) * 1e3);
-  }, function(date, offset) {
-    date.setTime(date.getTime() + Math.floor(offset) * 1e3);
-  }, function(date) {
-    return date.getSeconds();
-  });
-  d3_time.seconds = d3_time.second.range;
-  d3_time.seconds.utc = d3_time.second.utc.range;
-  d3_time.minute = d3_time_interval(function(date) {
-    return new d3_date(Math.floor(date / 6e4) * 6e4);
-  }, function(date, offset) {
-    date.setTime(date.getTime() + Math.floor(offset) * 6e4);
-  }, function(date) {
-    return date.getMinutes();
-  });
-  d3_time.minutes = d3_time.minute.range;
-  d3_time.minutes.utc = d3_time.minute.utc.range;
-  d3_time.hour = d3_time_interval(function(date) {
-    var timezone = date.getTimezoneOffset() / 60;
-    return new d3_date((Math.floor(date / 36e5 - timezone) + timezone) * 36e5);
-  }, function(date, offset) {
-    date.setTime(date.getTime() + Math.floor(offset) * 36e5);
-  }, function(date) {
-    return date.getHours();
-  });
-  d3_time.hours = d3_time.hour.range;
-  d3_time.hours.utc = d3_time.hour.utc.range;
-  d3_time.month = d3_time_interval(function(date) {
-    date = d3_time.day(date);
-    date.setDate(1);
-    return date;
-  }, function(date, offset) {
-    date.setMonth(date.getMonth() + offset);
-  }, function(date) {
-    return date.getMonth();
-  });
-  d3_time.months = d3_time.month.range;
-  d3_time.months.utc = d3_time.month.utc.range;
-  function d3_time_scale(linear, methods, format) {
-    function scale(x) {
-      return linear(x);
-    }
-    scale.invert = function(x) {
-      return d3_time_scaleDate(linear.invert(x));
-    };
-    scale.domain = function(x) {
-      if (!arguments.length) return linear.domain().map(d3_time_scaleDate);
-      linear.domain(x);
-      return scale;
-    };
-    function tickMethod(extent, count) {
-      var span = extent[1] - extent[0], target = span / count, i = d3.bisect(d3_time_scaleSteps, target);
-      return i == d3_time_scaleSteps.length ? [ methods.year, d3_scale_linearTickRange(extent.map(function(d) {
-        return d / 31536e6;
-      }), count)[2] ] : !i ? [ d3_time_scaleMilliseconds, d3_scale_linearTickRange(extent, count)[2] ] : methods[target / d3_time_scaleSteps[i - 1] < d3_time_scaleSteps[i] / target ? i - 1 : i];
-    }
-    scale.nice = function(interval, skip) {
-      var domain = scale.domain(), extent = d3_scaleExtent(domain), method = interval == null ? tickMethod(extent, 10) : typeof interval === "number" && tickMethod(extent, interval);
-      if (method) interval = method[0], skip = method[1];
-      function skipped(date) {
-        return !isNaN(date) && !interval.range(date, d3_time_scaleDate(+date + 1), skip).length;
-      }
-      return scale.domain(d3_scale_nice(domain, skip > 1 ? {
-        floor: function(date) {
-          while (skipped(date = interval.floor(date))) date = d3_time_scaleDate(date - 1);
-          return date;
-        },
-        ceil: function(date) {
-          while (skipped(date = interval.ceil(date))) date = d3_time_scaleDate(+date + 1);
-          return date;
-        }
-      } : interval));
-    };
-    scale.ticks = function(interval, skip) {
-      var extent = d3_scaleExtent(scale.domain()), method = interval == null ? tickMethod(extent, 10) : typeof interval === "number" ? tickMethod(extent, interval) : !interval.range && [ {
-        range: interval
-      }, skip ];
-      if (method) interval = method[0], skip = method[1];
-      return interval.range(extent[0], d3_time_scaleDate(+extent[1] + 1), skip < 1 ? 1 : skip);
-    };
-    scale.tickFormat = function() {
-      return format;
-    };
-    scale.copy = function() {
-      return d3_time_scale(linear.copy(), methods, format);
-    };
-    return d3_scale_linearRebind(scale, linear);
-  }
-  function d3_time_scaleDate(t) {
-    return new Date(t);
-  }
-  var d3_time_scaleSteps = [ 1e3, 5e3, 15e3, 3e4, 6e4, 3e5, 9e5, 18e5, 36e5, 108e5, 216e5, 432e5, 864e5, 1728e5, 6048e5, 2592e6, 7776e6, 31536e6 ];
-  var d3_time_scaleLocalMethods = [ [ d3_time.second, 1 ], [ d3_time.second, 5 ], [ d3_time.second, 15 ], [ d3_time.second, 30 ], [ d3_time.minute, 1 ], [ d3_time.minute, 5 ], [ d3_time.minute, 15 ], [ d3_time.minute, 30 ], [ d3_time.hour, 1 ], [ d3_time.hour, 3 ], [ d3_time.hour, 6 ], [ d3_time.hour, 12 ], [ d3_time.day, 1 ], [ d3_time.day, 2 ], [ d3_time.week, 1 ], [ d3_time.month, 1 ], [ d3_time.month, 3 ], [ d3_time.year, 1 ] ];
-  var d3_time_scaleLocalFormat = d3_time_format.multi([ [ ".%L", function(d) {
-    return d.getMilliseconds();
-  } ], [ ":%S", function(d) {
-    return d.getSeconds();
-  } ], [ "%I:%M", function(d) {
-    return d.getMinutes();
-  } ], [ "%I %p", function(d) {
-    return d.getHours();
-  } ], [ "%a %d", function(d) {
-    return d.getDay() && d.getDate() != 1;
-  } ], [ "%b %d", function(d) {
-    return d.getDate() != 1;
-  } ], [ "%B", function(d) {
-    return d.getMonth();
-  } ], [ "%Y", d3_true ] ]);
-  var d3_time_scaleMilliseconds = {
-    range: function(start, stop, step) {
-      return d3.range(Math.ceil(start / step) * step, +stop, step).map(d3_time_scaleDate);
-    },
-    floor: d3_identity,
-    ceil: d3_identity
-  };
-  d3_time_scaleLocalMethods.year = d3_time.year;
-  d3_time.scale = function() {
-    return d3_time_scale(d3.scale.linear(), d3_time_scaleLocalMethods, d3_time_scaleLocalFormat);
-  };
-  var d3_time_scaleUtcMethods = d3_time_scaleLocalMethods.map(function(m) {
-    return [ m[0].utc, m[1] ];
-  });
-  var d3_time_scaleUtcFormat = d3_time_formatUtc.multi([ [ ".%L", function(d) {
-    return d.getUTCMilliseconds();
-  } ], [ ":%S", function(d) {
-    return d.getUTCSeconds();
-  } ], [ "%I:%M", function(d) {
-    return d.getUTCMinutes();
-  } ], [ "%I %p", function(d) {
-    return d.getUTCHours();
-  } ], [ "%a %d", function(d) {
-    return d.getUTCDay() && d.getUTCDate() != 1;
-  } ], [ "%b %d", function(d) {
-    return d.getUTCDate() != 1;
-  } ], [ "%B", function(d) {
-    return d.getUTCMonth();
-  } ], [ "%Y", d3_true ] ]);
-  d3_time_scaleUtcMethods.year = d3_time.year.utc;
-  d3_time.scale.utc = function() {
-    return d3_time_scale(d3.scale.linear(), d3_time_scaleUtcMethods, d3_time_scaleUtcFormat);
-  };
   d3.text = d3_xhrType(function(request) {
     return request.responseText;
   });
diff --git a/d3.min.js b/d3.min.js
deleted file mode 100644
index 8555bea1fa305..0000000000000
--- a/d3.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-!function(){function n(n){return n&&(n.ownerDocument||n.document||n).documentElement}function t(n){return n&&(n.ownerDocument&&n.ownerDocument.defaultView||n.document&&n||n.defaultView)}function e(n,t){return t>n?-1:n>t?1:n>=t?0:NaN}function r(n){return null===n?NaN:+n}function u(n){return!isNaN(n)}function i(n){return{left:function(t,e,r,u){for(arguments.length<3&&(r=0),arguments.length<4&&(u=t.length);u>r;){var i=r+u>>>1;n(t[i],e)<0?r=i+1:u=i}return r},right:function(t,e,r,u){for(arguments.length<3&&(r=0),arguments.length<4&&(u=t.length);u>r;){var i=r+u>>>1;n(t[i],e)>0?u=i:r=i+1}return r}}}function o(n){return n.length}function a(n){for(var t=1;n*t%1;)t*=10;return t}function l(n,t){for(var e in t)Object.defineProperty(n.prototype,e,{value:t[e],enumerable:!1})}function c(){this._=Object.create(null)}function f(n){return(n+="")===ei||n[0]===ri?ri+n:n}function s(n){return(n+="")[0]===ri?n.slice(1):n}function h(n){return f(n)in this._}function g(n){return(n=f(n))in this._&&delete this._[n]}function p(){var n=[];for(var t in this._)n.push(s(t));return n}function d(){var n=0;for(var t in this._)++n;return n}function v(){for(var n in this._)return!1;return!0}function y(){this._=Object.create(null)}function m(n){return n}function x(n,t,e){return function(){var r=e.apply(t,arguments);return r===t?n:r}}function M(n,t){if(t in n)return t;t=t.charAt(0).toUpperCase()+t.slice(1);for(var e=0,r=ui.length;r>e;++e){var u=ui[e]+t;if(u in n)return u}}function _(){}function b(){}function w(n){function t(){for(var t,r=e,u=-1,i=r.length;++u<i;)(t=r[u].on)&&t.apply(this,arguments);return n}var e=[],r=new c;return t.on=function(t,u){var i,o=r.get(t);return arguments.length<2?o&&o.on:(o&&(o.on=null,e=e.slice(0,i=e.indexOf(o)).concat(e.slice(i+1)),r.remove(t)),u&&e.push(r.set(t,{on:u})),n)},t}function k(){Iu.event.preventDefault()}function N(){for(var n,t=Iu.event;n=t.sourceEvent;)t=n;return t}function A(n){for(var t=new b,e=0,r=arguments.length;++e<r;)t[arguments[e]]=w(t);return t.of=function(e,r){return function(u){try{var i=u.sourceEvent=Iu.event;u.target=n,Iu.event=u,t[u.type].apply(e,r)}finally{Iu.event=i}}},t}function C(n){return oi(n,fi),n}function z(n){return"function"==typeof n?n:function(){return ai(n,this)}}function L(n){return"function"==typeof n?n:function(){return li(n,this)}}function S(n,t){function e(){this.removeAttribute(n)}function r(){this.removeAttributeNS(n.space,n.local)}function u(){this.setAttribute(n,t)}function i(){this.setAttributeNS(n.space,n.local,t)}function o(){var e=t.apply(this,arguments);null==e?this.removeAttribute(n):this.setAttribute(n,e)}function a(){var e=t.apply(this,arguments);null==e?this.removeAttributeNS(n.space,n.local):this.setAttributeNS(n.space,n.local,e)}return n=Iu.ns.qualify(n),null==t?n.local?r:e:"function"==typeof t?n.local?a:o:n.local?i:u}function T(n){return n.trim().replace(/\s+/g," ")}function q(n){return new RegExp("(?:^|\\s+)"+Iu.requote(n)+"(?:\\s+|$)","g")}function D(n){return(n+"").trim().split(/^|\s+/)}function R(n,t){function e(){for(var e=-1;++e<u;)n[e](this,t)}function r(){for(var e=-1,r=t.apply(this,arguments);++e<u;)n[e](this,r)}n=D(n).map(E);var u=n.length;return"function"==typeof t?r:e}function E(n){var t=q(n);return function(e,r){if(u=e.classList)return r?u.add(n):u.remove(n);var u=e.getAttribute("class")||"";r?(t.lastIndex=0,t.test(u)||e.setAttribute("class",T(u+" "+n))):e.setAttribute("class",T(u.replace(t," ")))}}function U(n,t,e){function r(){this.style.removeProperty(n)}function u(){this.style.setProperty(n,t,e)}function i(){var r=t.apply(this,arguments);null==r?this.style.removeProperty(n):this.style.setProperty(n,r,e)}return null==t?r:"function"==typeof t?i:u}function P(n,t){function e(){delete this[n]}function r(){this[n]=t}function u(){var e=t.apply(this,arguments);null==e?delete this[n]:this[n]=e}return null==t?e:"function"==typeof t?u:r}function j(n){function t(){var t=this.ownerDocument,e=this.namespaceURI;return e===si&&t.documentElement.namespaceURI===si?t.createElement(n):t.createElementNS(e,n)}function e(){return this.ownerDocument.createElementNS(n.space,n.local)}return"function"==typeof n?n:(n=Iu.ns.qualify(n)).local?e:t}function H(){var n=this.parentNode;n&&n.removeChild(this)}function F(n){return{__data__:n}}function O(n){return function(){return ci(this,n)}}function Y(n){return arguments.length||(n=e),function(t,e){return t&&e?n(t.__data__,e.__data__):!t-!e}}function I(n,t){for(var e=0,r=n.length;r>e;e++)for(var u,i=n[e],o=0,a=i.length;a>o;o++)(u=i[o])&&t(u,o,e);return n}function Z(n){return oi(n,gi),n}function V(n){var t,e;return function(r,u,i){var o,a=n[i].update,l=a.length;for(i!=e&&(e=i,t=0),u>=t&&(t=u+1);!(o=a[t])&&++t<l;);return o}}function X(n,t,e){function r(){var t=this[o];t&&(this.removeEventListener(n,t,t.$),delete this[o])}function u(){var u=l(t,Vu(arguments));r.call(this),this.addEventListener(n,this[o]=u,u.$=e),u._=t}function i(){var t,e=new RegExp("^__on([^.]+)"+Iu.requote(n)+"$");for(var r in this)if(t=r.match(e)){var u=this[r];this.removeEventListener(t[1],u,u.$),delete this[r]}}var o="__on"+n,a=n.indexOf("."),l=$;a>0&&(n=n.slice(0,a));var c=pi.get(n);return c&&(n=c,l=B),a?t?u:r:t?_:i}function $(n,t){return function(e){var r=Iu.event;Iu.event=e,t[0]=this.__data__;try{n.apply(this,t)}finally{Iu.event=r}}}function B(n,t){var e=$(n,t);return function(n){var t=this,r=n.relatedTarget;r&&(r===t||8&r.compareDocumentPosition(t))||e.call(t,n)}}function W(e){var r=".dragsuppress-"+ ++vi,u="click"+r,i=Iu.select(t(e)).on("touchmove"+r,k).on("dragstart"+r,k).on("selectstart"+r,k);if(null==di&&(di="onselectstart"in e?!1:M(e.style,"userSelect")),di){var o=n(e).style,a=o[di];o[di]="none"}return function(n){if(i.on(r,null),di&&(o[di]=a),n){var t=function(){i.on(u,null)};i.on(u,function(){k(),t()},!0),setTimeout(t,0)}}}function J(n,e){e.changedTouches&&(e=e.changedTouches[0]);var r=n.ownerSVGElement||n;if(r.createSVGPoint){var u=r.createSVGPoint();if(0>yi){var i=t(n);if(i.scrollX||i.scrollY){r=Iu.select("body").append("svg").style({position:"absolute",top:0,left:0,margin:0,padding:0,border:"none"},"important");var o=r[0][0].getScreenCTM();yi=!(o.f||o.e),r.remove()}}return yi?(u.x=e.pageX,u.y=e.pageY):(u.x=e.clientX,u.y=e.clientY),u=u.matrixTransform(n.getScreenCTM().inverse()),[u.x,u.y]}var a=n.getBoundingClientRect();return[e.clientX-a.left-n.clientLeft,e.clientY-a.top-n.clientTop]}function G(){return Iu.event.changedTouches[0].identifier}function K(n,t,e){return(t[0]-n[0])*(e[1]-n[1])-(t[1]-n[1])*(e[0]-n[0])}function Q(n){return n>1?wi:-1>n?-wi:Math.asin(n)}function nn(n){return((n=Math.exp(n))-1/n)/2}function tn(n){return((n=Math.exp(n))+1/n)/2}function en(n){return((n=Math.exp(2*n))-1)/(n+1)}function rn(){}function un(n,t,e){return this instanceof un?(this.h=+n,this.s=+t,void(this.l=+e)):arguments.length<2?n instanceof un?new un(n.h,n.s,n.l):xn(""+n,Mn,un):new un(n,t,e)}function on(n,t,e){function r(n){return n>360?n-=360:0>n&&(n+=360),60>n?i+(o-i)*n/60:180>n?o:240>n?i+(o-i)*(240-n)/60:i}function u(n){return Math.round(255*r(n))}var i,o;return n=isNaN(n)?0:(n%=360)<0?n+360:n,t=isNaN(t)?0:0>t?0:t>1?1:t,e=0>e?0:e>1?1:e,o=.5>=e?e*(1+t):e+t-e*t,i=2*e-o,new dn(u(n+120),u(n),u(n-120))}function an(n,t,e){return this instanceof an?(this.h=+n,this.c=+t,void(this.l=+e)):arguments.length<2?n instanceof an?new an(n.h,n.c,n.l):n instanceof cn?sn(n.l,n.a,n.b):sn((n=_n((n=Iu.rgb(n)).r,n.g,n.b)).l,n.a,n.b):new an(n,t,e)}function ln(n,t,e){return isNaN(n)&&(n=0),isNaN(t)&&(t=0),new cn(e,Math.cos(n*=ki)*t,Math.sin(n)*t)}function cn(n,t,e){return this instanceof cn?(this.l=+n,this.a=+t,void(this.b=+e)):arguments.length<2?n instanceof cn?new cn(n.l,n.a,n.b):n instanceof an?ln(n.h,n.c,n.l):_n((n=dn(n)).r,n.g,n.b):new cn(n,t,e)}function fn(n,t,e){var r=(n+16)/116,u=r+t/500,i=r-e/200;return u=hn(u)*Ei,r=hn(r)*Ui,i=hn(i)*Pi,new dn(pn(3.2404542*u-1.5371385*r-.4985314*i),pn(-.969266*u+1.8760108*r+.041556*i),pn(.0556434*u-.2040259*r+1.0572252*i))}function sn(n,t,e){return n>0?new an(Math.atan2(e,t)*Ni,Math.sqrt(t*t+e*e),n):new an(NaN,NaN,n)}function hn(n){return n>.206893034?n*n*n:(n-4/29)/7.787037}function gn(n){return n>.008856?Math.pow(n,1/3):7.787037*n+4/29}function pn(n){return Math.round(255*(.00304>=n?12.92*n:1.055*Math.pow(n,1/2.4)-.055))}function dn(n,t,e){return this instanceof dn?(this.r=~~n,this.g=~~t,void(this.b=~~e)):arguments.length<2?n instanceof dn?new dn(n.r,n.g,n.b):xn(""+n,dn,on):new dn(n,t,e)}function vn(n){return new dn(n>>16,n>>8&255,255&n)}function yn(n){return vn(n)+""}function mn(n){return 16>n?"0"+Math.max(0,n).toString(16):Math.min(255,n).toString(16)}function xn(n,t,e){var r,u,i,o=0,a=0,l=0;if(r=/([a-z]+)\((.*)\)/.exec(n=n.toLowerCase()))switch(u=r[2].split(","),r[1]){case"hsl":return e(parseFloat(u[0]),parseFloat(u[1])/100,parseFloat(u[2])/100);case"rgb":return t(wn(u[0]),wn(u[1]),wn(u[2]))}return(i=Fi.get(n))?t(i.r,i.g,i.b):(null==n||"#"!==n.charAt(0)||isNaN(i=parseInt(n.slice(1),16))||(4===n.length?(o=(3840&i)>>4,o=o>>4|o,a=240&i,a=a>>4|a,l=15&i,l=l<<4|l):7===n.length&&(o=(16711680&i)>>16,a=(65280&i)>>8,l=255&i)),t(o,a,l))}function Mn(n,t,e){var r,u,i=Math.min(n/=255,t/=255,e/=255),o=Math.max(n,t,e),a=o-i,l=(o+i)/2;return a?(u=.5>l?a/(o+i):a/(2-o-i),r=n==o?(t-e)/a+(e>t?6:0):t==o?(e-n)/a+2:(n-t)/a+4,r*=60):(r=NaN,u=l>0&&1>l?0:r),new un(r,u,l)}function _n(n,t,e){n=bn(n),t=bn(t),e=bn(e);var r=gn((.4124564*n+.3575761*t+.1804375*e)/Ei),u=gn((.2126729*n+.7151522*t+.072175*e)/Ui),i=gn((.0193339*n+.119192*t+.9503041*e)/Pi);return cn(116*u-16,500*(r-u),200*(u-i))}function bn(n){return(n/=255)<=.04045?n/12.92:Math.pow((n+.055)/1.055,2.4)}function wn(n){var t=parseFloat(n);return"%"===n.charAt(n.length-1)?Math.round(2.55*t):t}function kn(n){return"function"==typeof n?n:function(){return n}}function Nn(n){return function(t,e,r){return 2===arguments.length&&"function"==typeof e&&(r=e,e=null),An(t,e,n,r)}}function An(n,t,e,r){function u(){var n,t=l.status;if(!t&&zn(l)||t>=200&&300>t||304===t){try{n=e.call(i,l)}catch(r){return void o.error.call(i,r)}o.load.call(i,n)}else o.error.call(i,l)}var i={},o=Iu.dispatch("beforesend","progress","load","error"),a={},l=new XMLHttpRequest,c=null;return!self.XDomainRequest||"withCredentials"in l||!/^(http(s)?:)?\/\//.test(n)||(l=new XDomainRequest),"onload"in l?l.onload=l.onerror=u:l.onreadystatechange=function(){l.readyState>3&&u()},l.onprogress=function(n){var t=Iu.event;Iu.event=n;try{o.progress.call(i,l)}finally{Iu.event=t}},i.header=function(n,t){return n=(n+"").toLowerCase(),arguments.length<2?a[n]:(null==t?delete a[n]:a[n]=t+"",i)},i.mimeType=function(n){return arguments.length?(t=null==n?null:n+"",i):t},i.responseType=function(n){return arguments.length?(c=n,i):c},i.response=function(n){return e=n,i},["get","post"].forEach(function(n){i[n]=function(){return i.send.apply(i,[n].concat(Vu(arguments)))}}),i.send=function(e,r,u){if(2===arguments.length&&"function"==typeof r&&(u=r,r=null),l.open(e,n,!0),null==t||"accept"in a||(a.accept=t+",*/*"),l.setRequestHeader)for(var f in a)l.setRequestHeader(f,a[f]);return null!=t&&l.overrideMimeType&&l.overrideMimeType(t),null!=c&&(l.responseType=c),null!=u&&i.on("error",u).on("load",function(n){u(null,n)}),o.beforesend.call(i,l),l.send(null==r?null:r),i},i.abort=function(){return l.abort(),i},Iu.rebind(i,o,"on"),null==r?i:i.get(Cn(r))}function Cn(n){return 1===n.length?function(t,e){n(null==t?e:null)}:n}function zn(n){var t=n.responseType;return t&&"text"!==t?n.response:n.responseText}function Ln(n,t,e){var r=arguments.length;2>r&&(t=0),3>r&&(e=Date.now());var u=e+t,i={c:n,t:u,n:null};return Yi?Yi.n=i:Oi=i,Yi=i,Ii||(Zi=clearTimeout(Zi),Ii=1,Vi(Sn)),i}function Sn(){var n=Tn(),t=qn()-n;t>24?(isFinite(t)&&(clearTimeout(Zi),Zi=setTimeout(Sn,t)),Ii=0):(Ii=1,Vi(Sn))}function Tn(){for(var n=Date.now(),t=Oi;t;)n>=t.t&&t.c(n-t.t)&&(t.c=null),t=t.n;return n}function qn(){for(var n,t=Oi,e=1/0;t;)t.c?(t.t<e&&(e=t.t),t=(n=t).n):t=n?n.n=t.n:Oi=t.n;return Yi=n,e}function Dn(n,t){return t-(n?Math.ceil(Math.log(n)/Math.LN10):1)}function Rn(n,t){var e=Math.pow(10,3*ti(8-t));return{scale:t>8?function(n){return n/e}:function(n){return n*e},symbol:n}}function En(n){var t=n.decimal,e=n.thousands,r=n.grouping,u=n.currency,i=r&&e?function(n,t){for(var u=n.length,i=[],o=0,a=r[0],l=0;u>0&&a>0&&(l+a+1>t&&(a=Math.max(1,t-l)),i.push(n.substring(u-=a,u+a)),!((l+=a+1)>t));)a=r[o=(o+1)%r.length];return i.reverse().join(e)}:m;return function(n){var e=$i.exec(n),r=e[1]||" ",o=e[2]||">",a=e[3]||"-",l=e[4]||"",c=e[5],f=+e[6],s=e[7],h=e[8],g=e[9],p=1,d="",v="",y=!1,m=!0;switch(h&&(h=+h.substring(1)),(c||"0"===r&&"="===o)&&(c=r="0",o="="),g){case"n":s=!0,g="g";break;case"%":p=100,v="%",g="f";break;case"p":p=100,v="%",g="r";break;case"b":case"o":case"x":case"X":"#"===l&&(d="0"+g.toLowerCase());case"c":m=!1;case"d":y=!0,h=0;break;case"s":p=-1,g="r"}"$"===l&&(d=u[0],v=u[1]),"r"!=g||h||(g="g"),null!=h&&("g"==g?h=Math.max(1,Math.min(21,h)):"e"!=g&&"f"!=g||(h=Math.max(0,Math.min(20,h)))),g=Bi.get(g)||Un;var x=c&&s;return function(n){var e=v;if(y&&n%1)return"";var u=0>n||0===n&&0>1/n?(n=-n,"-"):"-"===a?"":a;if(0>p){var l=Iu.formatPrefix(n,h);n=l.scale(n),e=l.symbol+v}else n*=p;n=g(n,h);var M,_,b=n.lastIndexOf(".");if(0>b){var w=m?n.lastIndexOf("e"):-1;0>w?(M=n,_=""):(M=n.substring(0,w),_=n.substring(w))}else M=n.substring(0,b),_=t+n.substring(b+1);!c&&s&&(M=i(M,1/0));var k=d.length+M.length+_.length+(x?0:u.length),N=f>k?new Array(k=f-k+1).join(r):"";return x&&(M=i(N+M,N.length?f-_.length:1/0)),u+=d,n=M+_,("<"===o?u+n+N:">"===o?N+u+n:"^"===o?N.substring(0,k>>=1)+u+n+N.substring(k):u+(x?n:N+n))+e}}}function Un(n){return n+""}function Pn(){this._=new Date(arguments.length>1?Date.UTC.apply(this,arguments):arguments[0])}function jn(n,t,e){function r(t){var e=n(t),r=i(e,1);return r-t>t-e?e:r}function u(e){return t(e=n(new Ji(e-1)),1),e}function i(n,e){return t(n=new Ji(+n),e),n}function o(n,r,i){var o=u(n),a=[];if(i>1)for(;r>o;)e(o)%i||a.push(new Date(+o)),t(o,1);else for(;r>o;)a.push(new Date(+o)),t(o,1);return a}function a(n,t,e){try{Ji=Pn;var r=new Pn;return r._=n,o(r,t,e)}finally{Ji=Date}}n.floor=n,n.round=r,n.ceil=u,n.offset=i,n.range=o;var l=n.utc=Hn(n);return l.floor=l,l.round=Hn(r),l.ceil=Hn(u),l.offset=Hn(i),l.range=a,n}function Hn(n){return function(t,e){try{Ji=Pn;var r=new Pn;return r._=t,n(r,e)._}finally{Ji=Date}}}function Fn(n){function t(n){function t(t){for(var e,u,i,o=[],a=-1,l=0;++a<r;)37===n.charCodeAt(a)&&(o.push(n.slice(l,a)),null!=(u=Ki[e=n.charAt(++a)])&&(e=n.charAt(++a)),(i=z[e])&&(e=i(t,null==u?"e"===e?" ":"0":u)),o.push(e),l=a+1);return o.push(n.slice(l,a)),o.join("")}var r=n.length;return t.parse=function(t){var r={y:1900,m:0,d:1,H:0,M:0,S:0,L:0,Z:null},u=e(r,n,t,0);if(u!=t.length)return null;"p"in r&&(r.H=r.H%12+12*r.p);var i=null!=r.Z&&Ji!==Pn,o=new(i?Pn:Ji);return"j"in r?o.setFullYear(r.y,0,r.j):"W"in r||"U"in r?("w"in r||(r.w="W"in r?1:0),o.setFullYear(r.y,0,1),o.setFullYear(r.y,0,"W"in r?(r.w+6)%7+7*r.W-(o.getDay()+5)%7:r.w+7*r.U-(o.getDay()+6)%7)):o.setFullYear(r.y,r.m,r.d),o.setHours(r.H+(r.Z/100|0),r.M+r.Z%100,r.S,r.L),i?o._:o},t.toString=function(){return n},t}function e(n,t,e,r){for(var u,i,o,a=0,l=t.length,c=e.length;l>a;){if(r>=c)return-1;if(u=t.charCodeAt(a++),37===u){if(o=t.charAt(a++),i=L[o in Ki?t.charAt(a++):o],!i||(r=i(n,e,r))<0)return-1}else if(u!=e.charCodeAt(r++))return-1}return r}function r(n,t,e){b.lastIndex=0;var r=b.exec(t.slice(e));return r?(n.w=w.get(r[0].toLowerCase()),e+r[0].length):-1}function u(n,t,e){M.lastIndex=0;var r=M.exec(t.slice(e));return r?(n.w=_.get(r[0].toLowerCase()),e+r[0].length):-1}function i(n,t,e){A.lastIndex=0;var r=A.exec(t.slice(e));return r?(n.m=C.get(r[0].toLowerCase()),e+r[0].length):-1}function o(n,t,e){k.lastIndex=0;var r=k.exec(t.slice(e));return r?(n.m=N.get(r[0].toLowerCase()),e+r[0].length):-1}function a(n,t,r){return e(n,z.c.toString(),t,r)}function l(n,t,r){return e(n,z.x.toString(),t,r)}function c(n,t,r){return e(n,z.X.toString(),t,r)}function f(n,t,e){var r=x.get(t.slice(e,e+=2).toLowerCase());return null==r?-1:(n.p=r,e)}var s=n.dateTime,h=n.date,g=n.time,p=n.periods,d=n.days,v=n.shortDays,y=n.months,m=n.shortMonths;t.utc=function(n){function e(n){try{Ji=Pn;var t=new Ji;return t._=n,r(t)}finally{Ji=Date}}var r=t(n);return e.parse=function(n){try{Ji=Pn;var t=r.parse(n);return t&&t._}finally{Ji=Date}},e.toString=r.toString,e},t.multi=t.utc.multi=ot;var x=Iu.map(),M=Yn(d),_=In(d),b=Yn(v),w=In(v),k=Yn(y),N=In(y),A=Yn(m),C=In(m);p.forEach(function(n,t){x.set(n.toLowerCase(),t)});var z={a:function(n){return v[n.getDay()]},A:function(n){return d[n.getDay()]},b:function(n){return m[n.getMonth()]},B:function(n){return y[n.getMonth()]},c:t(s),d:function(n,t){return On(n.getDate(),t,2)},e:function(n,t){return On(n.getDate(),t,2)},H:function(n,t){return On(n.getHours(),t,2)},I:function(n,t){return On(n.getHours()%12||12,t,2)},j:function(n,t){return On(1+Wi.dayOfYear(n),t,3)},L:function(n,t){return On(n.getMilliseconds(),t,3)},m:function(n,t){return On(n.getMonth()+1,t,2)},M:function(n,t){return On(n.getMinutes(),t,2)},p:function(n){return p[+(n.getHours()>=12)]},S:function(n,t){return On(n.getSeconds(),t,2)},U:function(n,t){return On(Wi.sundayOfYear(n),t,2)},w:function(n){return n.getDay()},W:function(n,t){return On(Wi.mondayOfYear(n),t,2)},x:t(h),X:t(g),y:function(n,t){return On(n.getFullYear()%100,t,2)},Y:function(n,t){return On(n.getFullYear()%1e4,t,4)},Z:ut,"%":function(){return"%"}},L={a:r,A:u,b:i,B:o,c:a,d:Kn,e:Kn,H:nt,I:nt,j:Qn,L:rt,m:Gn,M:tt,p:f,S:et,U:Vn,w:Zn,W:Xn,x:l,X:c,y:Bn,Y:$n,Z:Wn,"%":it};return t}function On(n,t,e){var r=0>n?"-":"",u=(r?-n:n)+"",i=u.length;return r+(e>i?new Array(e-i+1).join(t)+u:u)}function Yn(n){return new RegExp("^(?:"+n.map(Iu.requote).join("|")+")","i")}function In(n){for(var t=new c,e=-1,r=n.length;++e<r;)t.set(n[e].toLowerCase(),e);return t}function Zn(n,t,e){Qi.lastIndex=0;var r=Qi.exec(t.slice(e,e+1));return r?(n.w=+r[0],e+r[0].length):-1}function Vn(n,t,e){Qi.lastIndex=0;var r=Qi.exec(t.slice(e));return r?(n.U=+r[0],e+r[0].length):-1}function Xn(n,t,e){Qi.lastIndex=0;var r=Qi.exec(t.slice(e));return r?(n.W=+r[0],e+r[0].length):-1}function $n(n,t,e){Qi.lastIndex=0;var r=Qi.exec(t.slice(e,e+4));return r?(n.y=+r[0],e+r[0].length):-1}function Bn(n,t,e){Qi.lastIndex=0;var r=Qi.exec(t.slice(e,e+2));return r?(n.y=Jn(+r[0]),e+r[0].length):-1}function Wn(n,t,e){return/^[+-]\d{4}$/.test(t=t.slice(e,e+5))?(n.Z=-t,e+5):-1}function Jn(n){return n+(n>68?1900:2e3)}function Gn(n,t,e){Qi.lastIndex=0;var r=Qi.exec(t.slice(e,e+2));return r?(n.m=r[0]-1,e+r[0].length):-1}function Kn(n,t,e){Qi.lastIndex=0;var r=Qi.exec(t.slice(e,e+2));return r?(n.d=+r[0],e+r[0].length):-1}function Qn(n,t,e){Qi.lastIndex=0;var r=Qi.exec(t.slice(e,e+3));return r?(n.j=+r[0],e+r[0].length):-1}function nt(n,t,e){Qi.lastIndex=0;var r=Qi.exec(t.slice(e,e+2));return r?(n.H=+r[0],e+r[0].length):-1}function tt(n,t,e){Qi.lastIndex=0;var r=Qi.exec(t.slice(e,e+2));return r?(n.M=+r[0],e+r[0].length):-1}function et(n,t,e){Qi.lastIndex=0;var r=Qi.exec(t.slice(e,e+2));return r?(n.S=+r[0],e+r[0].length):-1}function rt(n,t,e){Qi.lastIndex=0;var r=Qi.exec(t.slice(e,e+3));return r?(n.L=+r[0],e+r[0].length):-1}function ut(n){var t=n.getTimezoneOffset(),e=t>0?"-":"+",r=ti(t)/60|0,u=ti(t)%60;return e+On(r,"0",2)+On(u,"0",2)}function it(n,t,e){no.lastIndex=0;var r=no.exec(t.slice(e,e+1));return r?e+r[0].length:-1}function ot(n){for(var t=n.length,e=-1;++e<t;)n[e][0]=this(n[e][0]);return function(t){for(var e=0,r=n[e];!r[1](t);)r=n[++e];return r[0](t)}}function at(n){return n[0]}function lt(n){return n[1]}function ct(n){for(var t=n.length,e=[0,1],r=2,u=2;t>u;u++){for(;r>1&&K(n[e[r-2]],n[e[r-1]],n[u])<=0;)--r;e[r++]=u}return e.slice(0,r)}function ft(n,t){return n[0]-t[0]||n[1]-t[1]}function st(n,t,e){return(e[0]-t[0])*(n[1]-t[1])<(e[1]-t[1])*(n[0]-t[0])}function ht(n,t,e,r){var u=n[0],i=e[0],o=t[0]-u,a=r[0]-i,l=n[1],c=e[1],f=t[1]-l,s=r[1]-c,h=(a*(l-c)-s*(u-i))/(s*o-a*f);return[u+h*o,l+h*f]}function gt(n){var t=n[0],e=n[n.length-1];return!(t[0]-e[0]||t[1]-e[1])}function pt(){Ut(this),this.edge=this.site=this.circle=null}function dt(n){var t=lo.pop()||new pt;return t.site=n,t}function vt(n){At(n),io.remove(n),lo.push(n),Ut(n)}function yt(n){var t=n.circle,e=t.x,r=t.cy,u={x:e,y:r},i=n.P,o=n.N,a=[n];vt(n);for(var l=i;l.circle&&ti(e-l.circle.x)<mi&&ti(r-l.circle.cy)<mi;)i=l.P,a.unshift(l),vt(l),l=i;a.unshift(l),At(l);for(var c=o;c.circle&&ti(e-c.circle.x)<mi&&ti(r-c.circle.cy)<mi;)o=c.N,a.push(c),vt(c),c=o;a.push(c),At(c);var f,s=a.length;for(f=1;s>f;++f)c=a[f],l=a[f-1],Dt(c.edge,l.site,c.site,u);l=a[0],c=a[s-1],c.edge=Tt(l.site,c.site,null,u),Nt(l),Nt(c)}function mt(n){for(var t,e,r,u,i=n.x,o=n.y,a=io._;a;)if(r=xt(a,o)-i,r>mi)a=a.L;else{if(u=i-Mt(a,o),!(u>mi)){r>-mi?(t=a.P,e=a):u>-mi?(t=a,e=a.N):t=e=a;break}if(!a.R){t=a;break}a=a.R}var l=dt(n);if(io.insert(t,l),t||e){if(t===e)return At(t),e=dt(t.site),io.insert(l,e),l.edge=e.edge=Tt(t.site,l.site),Nt(t),void Nt(e);if(!e)return void(l.edge=Tt(t.site,l.site));At(t),At(e);var c=t.site,f=c.x,s=c.y,h=n.x-f,g=n.y-s,p=e.site,d=p.x-f,v=p.y-s,y=2*(h*v-g*d),m=h*h+g*g,x=d*d+v*v,M={x:(v*m-g*x)/y+f,y:(h*x-d*m)/y+s};Dt(e.edge,c,p,M),l.edge=Tt(c,n,null,M),e.edge=Tt(n,p,null,M),Nt(t),Nt(e)}}function xt(n,t){var e=n.site,r=e.x,u=e.y,i=u-t;if(!i)return r;var o=n.P;if(!o)return-(1/0);e=o.site;var a=e.x,l=e.y,c=l-t;if(!c)return a;var f=a-r,s=1/i-1/c,h=f/c;return s?(-h+Math.sqrt(h*h-2*s*(f*f/(-2*c)-l+c/2+u-i/2)))/s+r:(r+a)/2}function Mt(n,t){var e=n.N;if(e)return xt(e,t);var r=n.site;return r.y===t?r.x:1/0}function _t(n){this.site=n,this.edges=[]}function bt(n){for(var t,e,r,u,i,o,a,l,c,f,s=n[0][0],h=n[1][0],g=n[0][1],p=n[1][1],d=uo,v=d.length;v--;)if(i=d[v],i&&i.prepare())for(a=i.edges,l=a.length,o=0;l>o;)f=a[o].end(),r=f.x,u=f.y,c=a[++o%l].start(),t=c.x,e=c.y,(ti(r-t)>mi||ti(u-e)>mi)&&(a.splice(o,0,new Rt(qt(i.site,f,ti(r-s)<mi&&p-u>mi?{x:s,y:ti(t-s)<mi?e:p}:ti(u-p)<mi&&h-r>mi?{x:ti(e-p)<mi?t:h,y:p}:ti(r-h)<mi&&u-g>mi?{x:h,y:ti(t-h)<mi?e:g}:ti(u-g)<mi&&r-s>mi?{x:ti(e-g)<mi?t:s,y:g}:null),i.site,null)),++l)}function wt(n,t){return t.angle-n.angle}function kt(){Ut(this),this.x=this.y=this.arc=this.site=this.cy=null}function Nt(n){var t=n.P,e=n.N;if(t&&e){var r=t.site,u=n.site,i=e.site;if(r!==i){var o=u.x,a=u.y,l=r.x-o,c=r.y-a,f=i.x-o,s=i.y-a,h=2*(l*s-c*f);if(!(h>=-xi)){var g=l*l+c*c,p=f*f+s*s,d=(s*g-c*p)/h,v=(l*p-f*g)/h,s=v+a,y=co.pop()||new kt;y.arc=n,y.site=u,y.x=d+o,y.y=s+Math.sqrt(d*d+v*v),y.cy=s,n.circle=y;for(var m=null,x=ao._;x;)if(y.y<x.y||y.y===x.y&&y.x<=x.x){if(!x.L){m=x.P;break}x=x.L}else{if(!x.R){m=x;break}x=x.R}ao.insert(m,y),m||(oo=y)}}}}function At(n){var t=n.circle;t&&(t.P||(oo=t.N),ao.remove(t),co.push(t),Ut(t),n.circle=null)}function Ct(n,t,e,r){return function(u){var i,o=u.a,a=u.b,l=o.x,c=o.y,f=a.x,s=a.y,h=0,g=1,p=f-l,d=s-c;if(i=n-l,p||!(i>0)){if(i/=p,0>p){if(h>i)return;g>i&&(g=i)}else if(p>0){if(i>g)return;i>h&&(h=i)}if(i=e-l,p||!(0>i)){if(i/=p,0>p){if(i>g)return;i>h&&(h=i)}else if(p>0){if(h>i)return;g>i&&(g=i)}if(i=t-c,d||!(i>0)){if(i/=d,0>d){if(h>i)return;g>i&&(g=i)}else if(d>0){if(i>g)return;i>h&&(h=i)}if(i=r-c,d||!(0>i)){if(i/=d,0>d){if(i>g)return;i>h&&(h=i)}else if(d>0){if(h>i)return;g>i&&(g=i)}return h>0&&(u.a={x:l+h*p,y:c+h*d}),1>g&&(u.b={x:l+g*p,y:c+g*d}),u}}}}}}function zt(n){for(var t,e=ro,r=Ct(n[0][0],n[0][1],n[1][0],n[1][1]),u=e.length;u--;)t=e[u],(!Lt(t,n)||!r(t)||ti(t.a.x-t.b.x)<mi&&ti(t.a.y-t.b.y)<mi)&&(t.a=t.b=null,e.splice(u,1))}function Lt(n,t){var e=n.b;if(e)return!0;var r,u,i=n.a,o=t[0][0],a=t[1][0],l=t[0][1],c=t[1][1],f=n.l,s=n.r,h=f.x,g=f.y,p=s.x,d=s.y,v=(h+p)/2,y=(g+d)/2;if(d===g){if(o>v||v>=a)return;if(h>p){if(i){if(i.y>=c)return}else i={x:v,y:l};e={x:v,y:c}}else{if(i){if(i.y<l)return}else i={x:v,y:c};e={x:v,y:l}}}else if(r=(h-p)/(d-g),u=y-r*v,-1>r||r>1)if(h>p){if(i){if(i.y>=c)return}else i={x:(l-u)/r,y:l};e={x:(c-u)/r,y:c}}else{if(i){if(i.y<l)return}else i={x:(c-u)/r,y:c};e={x:(l-u)/r,y:l}}else if(d>g){if(i){if(i.x>=a)return}else i={x:o,y:r*o+u};e={x:a,y:r*a+u}}else{if(i){if(i.x<o)return}else i={x:a,y:r*a+u};e={x:o,y:r*o+u}}return n.a=i,n.b=e,!0}function St(n,t){this.l=n,this.r=t,this.a=this.b=null}function Tt(n,t,e,r){var u=new St(n,t);return ro.push(u),e&&Dt(u,n,t,e),r&&Dt(u,t,n,r),uo[n.i].edges.push(new Rt(u,n,t)),uo[t.i].edges.push(new Rt(u,t,n)),u}function qt(n,t,e){var r=new St(n,null);return r.a=t,r.b=e,ro.push(r),r}function Dt(n,t,e,r){n.a||n.b?n.l===e?n.b=r:n.a=r:(n.a=r,n.l=t,n.r=e)}function Rt(n,t,e){var r=n.a,u=n.b;this.edge=n,this.site=t,this.angle=e?Math.atan2(e.y-t.y,e.x-t.x):n.l===t?Math.atan2(u.x-r.x,r.y-u.y):Math.atan2(r.x-u.x,u.y-r.y)}function Et(){this._=null}function Ut(n){n.U=n.C=n.L=n.R=n.P=n.N=null}function Pt(n,t){var e=t,r=t.R,u=e.U;u?u.L===e?u.L=r:u.R=r:n._=r,r.U=u,e.U=r,e.R=r.L,e.R&&(e.R.U=e),r.L=e}function jt(n,t){var e=t,r=t.L,u=e.U;u?u.L===e?u.L=r:u.R=r:n._=r,r.U=u,e.U=r,e.L=r.R,e.L&&(e.L.U=e),r.R=e}function Ht(n){for(;n.L;)n=n.L;return n}function Ft(n,t){var e,r,u,i=n.sort(Ot).pop();for(ro=[],uo=new Array(n.length),io=new Et,ao=new Et;;)if(u=oo,i&&(!u||i.y<u.y||i.y===u.y&&i.x<u.x))i.x===e&&i.y===r||(uo[i.i]=new _t(i),mt(i),e=i.x,r=i.y),i=n.pop();else{if(!u)break;yt(u.arc)}t&&(zt(t),bt(t));var o={cells:uo,edges:ro};return io=ao=ro=uo=null,o}function Ot(n,t){return t.y-n.y||t.x-n.x}function Yt(n,t,e){return(n.x-e.x)*(t.y-n.y)-(n.x-t.x)*(e.y-n.y)}function It(n){return n.x}function Zt(n){return n.y}function Vt(){return{leaf:!0,nodes:[],point:null,x:null,y:null}}function Xt(n,t,e,r,u,i){if(!n(t,e,r,u,i)){var o=.5*(e+u),a=.5*(r+i),l=t.nodes;l[0]&&Xt(n,l[0],e,r,o,a),l[1]&&Xt(n,l[1],o,r,u,a),l[2]&&Xt(n,l[2],e,a,o,i),l[3]&&Xt(n,l[3],o,a,u,i)}}function $t(n,t,e,r,u,i,o){var a,l=1/0;return function c(n,f,s,h,g){if(!(f>i||s>o||r>h||u>g)){if(p=n.point){var p,d=t-n.x,v=e-n.y,y=d*d+v*v;if(l>y){var m=Math.sqrt(l=y);r=t-m,u=e-m,i=t+m,o=e+m,a=p}}for(var x=n.nodes,M=.5*(f+h),_=.5*(s+g),b=t>=M,w=e>=_,k=w<<1|b,N=k+4;N>k;++k)if(n=x[3&k])switch(3&k){case 0:c(n,f,s,M,_);break;case 1:c(n,M,s,h,_);break;case 2:c(n,f,_,M,g);break;case 3:c(n,M,_,h,g)}}}(n,r,u,i,o),a}function Bt(n,t){n=Iu.rgb(n),t=Iu.rgb(t);var e=n.r,r=n.g,u=n.b,i=t.r-e,o=t.g-r,a=t.b-u;return function(n){return"#"+mn(Math.round(e+i*n))+mn(Math.round(r+o*n))+mn(Math.round(u+a*n))}}function Wt(n,t){var e,r={},u={};for(e in n)e in t?r[e]=Kt(n[e],t[e]):u[e]=n[e];for(e in t)e in n||(u[e]=t[e]);return function(n){for(e in r)u[e]=r[e](n);return u}}function Jt(n,t){return n=+n,t=+t,function(e){return n*(1-e)+t*e}}function Gt(n,t){var e,r,u,i=so.lastIndex=ho.lastIndex=0,o=-1,a=[],l=[];for(n+="",t+="";(e=so.exec(n))&&(r=ho.exec(t));)(u=r.index)>i&&(u=t.slice(i,u),a[o]?a[o]+=u:a[++o]=u),(e=e[0])===(r=r[0])?a[o]?a[o]+=r:a[++o]=r:(a[++o]=null,l.push({i:o,x:Jt(e,r)})),i=ho.lastIndex;return i<t.length&&(u=t.slice(i),a[o]?a[o]+=u:a[++o]=u),a.length<2?l[0]?(t=l[0].x,function(n){return t(n)+""}):function(){return t}:(t=l.length,function(n){for(var e,r=0;t>r;++r)a[(e=l[r]).i]=e.x(n);return a.join("")})}function Kt(n,t){for(var e,r=Iu.interpolators.length;--r>=0&&!(e=Iu.interpolators[r](n,t)););return e}function Qt(n,t){var e,r=[],u=[],i=n.length,o=t.length,a=Math.min(n.length,t.length);for(e=0;a>e;++e)r.push(Kt(n[e],t[e]));for(;i>e;++e)u[e]=n[e];for(;o>e;++e)u[e]=t[e];return function(n){for(e=0;a>e;++e)u[e]=r[e](n);return u}}function ne(n){return function(t){return 0>=t?0:t>=1?1:n(t)}}function te(n){return function(t){return 1-n(1-t)}}function ee(n){return function(t){return.5*(.5>t?n(2*t):2-n(2-2*t))}}function re(n){return n*n}function ue(n){return n*n*n}function ie(n){if(0>=n)return 0;if(n>=1)return 1;var t=n*n,e=t*n;return 4*(.5>n?e:3*(n-t)+e-.75)}function oe(n){return function(t){return Math.pow(t,n)}}function ae(n){return 1-Math.cos(n*wi)}function le(n){return Math.pow(2,10*(n-1))}function ce(n){return 1-Math.sqrt(1-n*n)}function fe(n,t){var e;return arguments.length<2&&(t=.45),arguments.length?e=t/_i*Math.asin(1/n):(n=1,e=t/4),function(r){return 1+n*Math.pow(2,-10*r)*Math.sin((r-e)*_i/t)}}function se(n){return n||(n=1.70158),function(t){return t*t*((n+1)*t-n)}}function he(n){return 1/2.75>n?7.5625*n*n:2/2.75>n?7.5625*(n-=1.5/2.75)*n+.75:2.5/2.75>n?7.5625*(n-=2.25/2.75)*n+.9375:7.5625*(n-=2.625/2.75)*n+.984375}function ge(n,t){n=Iu.hcl(n),t=Iu.hcl(t);var e=n.h,r=n.c,u=n.l,i=t.h-e,o=t.c-r,a=t.l-u;return isNaN(o)&&(o=0,r=isNaN(r)?t.c:r),isNaN(i)?(i=0,e=isNaN(e)?t.h:e):i>180?i-=360:-180>i&&(i+=360),function(n){return ln(e+i*n,r+o*n,u+a*n)+""}}function pe(n,t){n=Iu.hsl(n),t=Iu.hsl(t);var e=n.h,r=n.s,u=n.l,i=t.h-e,o=t.s-r,a=t.l-u;return isNaN(o)&&(o=0,r=isNaN(r)?t.s:r),isNaN(i)?(i=0,e=isNaN(e)?t.h:e):i>180?i-=360:-180>i&&(i+=360),function(n){return on(e+i*n,r+o*n,u+a*n)+""}}function de(n,t){n=Iu.lab(n),t=Iu.lab(t);var e=n.l,r=n.a,u=n.b,i=t.l-e,o=t.a-r,a=t.b-u;return function(n){return fn(e+i*n,r+o*n,u+a*n)+""}}function ve(n,t){return t-=n,function(e){return Math.round(n+t*e)}}function ye(n){var t=[n.a,n.b],e=[n.c,n.d],r=xe(t),u=me(t,e),i=xe(Me(e,t,-u))||0;t[0]*e[1]<e[0]*t[1]&&(t[0]*=-1,t[1]*=-1,r*=-1,u*=-1),this.rotate=(r?Math.atan2(t[1],t[0]):Math.atan2(-e[0],e[1]))*Ni,this.translate=[n.e,n.f],this.scale=[r,i],this.skew=i?Math.atan2(u,i)*Ni:0}function me(n,t){return n[0]*t[0]+n[1]*t[1]}function xe(n){var t=Math.sqrt(me(n,n));return t&&(n[0]/=t,n[1]/=t),t}function Me(n,t,e){return n[0]+=e*t[0],n[1]+=e*t[1],n}function _e(n){return n.length?n.pop()+",":""}function be(n,t,e,r){if(n[0]!==t[0]||n[1]!==t[1]){var u=e.push("translate(",null,",",null,")");r.push({i:u-4,x:Jt(n[0],t[0])},{i:u-2,x:Jt(n[1],t[1])})}else(t[0]||t[1])&&e.push("translate("+t+")")}function we(n,t,e,r){n!==t?(n-t>180?t+=360:t-n>180&&(n+=360),r.push({i:e.push(_e(e)+"rotate(",null,")")-2,x:Jt(n,t)})):t&&e.push(_e(e)+"rotate("+t+")")}function ke(n,t,e,r){n!==t?r.push({i:e.push(_e(e)+"skewX(",null,")")-2,x:Jt(n,t)}):t&&e.push(_e(e)+"skewX("+t+")")}function Ne(n,t,e,r){if(n[0]!==t[0]||n[1]!==t[1]){var u=e.push(_e(e)+"scale(",null,",",null,")");r.push({i:u-4,x:Jt(n[0],t[0])},{i:u-2,x:Jt(n[1],t[1])})}else 1===t[0]&&1===t[1]||e.push(_e(e)+"scale("+t+")")}function Ae(n,t){var e=[],r=[];return n=Iu.transform(n),t=Iu.transform(t),be(n.translate,t.translate,e,r),we(n.rotate,t.rotate,e,r),ke(n.skew,t.skew,e,r),Ne(n.scale,t.scale,e,r),n=t=null,function(n){for(var t,u=-1,i=r.length;++u<i;)e[(t=r[u]).i]=t.x(n);return e.join("")}}function Ce(n,t){return t=(t-=n=+n)||1/t,function(e){return(e-n)/t}}function ze(n,t){return t=(t-=n=+n)||1/t,function(e){return Math.max(0,Math.min(1,(e-n)/t))}}function Le(n){for(var t=n.source,e=n.target,r=Te(t,e),u=[t];t!==r;)t=t.parent,u.push(t);for(var i=u.length;e!==r;)u.splice(i,0,e),e=e.parent;return u}function Se(n){for(var t=[],e=n.parent;null!=e;)t.push(n),n=e,e=e.parent;return t.push(n),t}function Te(n,t){if(n===t)return n;for(var e=Se(n),r=Se(t),u=e.pop(),i=r.pop(),o=null;u===i;)o=u,u=e.pop(),i=r.pop();return o}function qe(n){n.fixed|=2}function De(n){n.fixed&=-7}function Re(n){n.fixed|=4,n.px=n.x,n.py=n.y}function Ee(n){n.fixed&=-5}function Ue(n,t,e){var r=0,u=0;if(n.charge=0,!n.leaf)for(var i,o=n.nodes,a=o.length,l=-1;++l<a;)i=o[l],null!=i&&(Ue(i,t,e),n.charge+=i.charge,r+=i.charge*i.cx,u+=i.charge*i.cy);if(n.point){n.leaf||(n.point.x+=Math.random()-.5,n.point.y+=Math.random()-.5);var c=t*e[n.point.index];n.charge+=n.pointCharge=c,r+=c*n.point.x,u+=c*n.point.y}n.cx=r/n.charge,n.cy=u/n.charge}function Pe(n,t){return Iu.rebind(n,t,"sort","children","value"),n.nodes=n,n.links=Ie,n}function je(n,t){for(var e=[n];null!=(n=e.pop());)if(t(n),(u=n.children)&&(r=u.length))for(var r,u;--r>=0;)e.push(u[r])}function He(n,t){for(var e=[n],r=[];null!=(n=e.pop());)if(r.push(n),(i=n.children)&&(u=i.length))for(var u,i,o=-1;++o<u;)e.push(i[o]);for(;null!=(n=r.pop());)t(n)}function Fe(n){return n.children}function Oe(n){return n.value}function Ye(n,t){return t.value-n.value}function Ie(n){return Iu.merge(n.map(function(n){return(n.children||[]).map(function(t){return{source:n,target:t}})}))}function Ze(n){return n.x}function Ve(n){return n.y}function Xe(n,t,e){n.y0=t,n.y=e}function $e(n){return Iu.range(n.length)}function Be(n){for(var t=-1,e=n[0].length,r=[];++t<e;)r[t]=0;
-return r}function We(n){for(var t,e=1,r=0,u=n[0][1],i=n.length;i>e;++e)(t=n[e][1])>u&&(r=e,u=t);return r}function Je(n){return n.reduce(Ge,0)}function Ge(n,t){return n+t[1]}function Ke(n,t){return Qe(n,Math.ceil(Math.log(t.length)/Math.LN2+1))}function Qe(n,t){for(var e=-1,r=+n[0],u=(n[1]-r)/t,i=[];++e<=t;)i[e]=u*e+r;return i}function nr(n){return[Iu.min(n),Iu.max(n)]}function tr(n,t){return n.value-t.value}function er(n,t){var e=n._pack_next;n._pack_next=t,t._pack_prev=n,t._pack_next=e,e._pack_prev=t}function rr(n,t){n._pack_next=t,t._pack_prev=n}function ur(n,t){var e=t.x-n.x,r=t.y-n.y,u=n.r+t.r;return.999*u*u>e*e+r*r}function ir(n){function t(n){f=Math.min(n.x-n.r,f),s=Math.max(n.x+n.r,s),h=Math.min(n.y-n.r,h),g=Math.max(n.y+n.r,g)}if((e=n.children)&&(c=e.length)){var e,r,u,i,o,a,l,c,f=1/0,s=-(1/0),h=1/0,g=-(1/0);if(e.forEach(or),r=e[0],r.x=-r.r,r.y=0,t(r),c>1&&(u=e[1],u.x=u.r,u.y=0,t(u),c>2))for(i=e[2],cr(r,u,i),t(i),er(r,i),r._pack_prev=i,er(i,u),u=r._pack_next,o=3;c>o;o++){cr(r,u,i=e[o]);var p=0,d=1,v=1;for(a=u._pack_next;a!==u;a=a._pack_next,d++)if(ur(a,i)){p=1;break}if(1==p)for(l=r._pack_prev;l!==a._pack_prev&&!ur(l,i);l=l._pack_prev,v++);p?(v>d||d==v&&u.r<r.r?rr(r,u=a):rr(r=l,u),o--):(er(r,i),u=i,t(i))}var y=(f+s)/2,m=(h+g)/2,x=0;for(o=0;c>o;o++)i=e[o],i.x-=y,i.y-=m,x=Math.max(x,i.r+Math.sqrt(i.x*i.x+i.y*i.y));n.r=x,e.forEach(ar)}}function or(n){n._pack_next=n._pack_prev=n}function ar(n){delete n._pack_next,delete n._pack_prev}function lr(n,t,e,r){var u=n.children;if(n.x=t+=r*n.x,n.y=e+=r*n.y,n.r*=r,u)for(var i=-1,o=u.length;++i<o;)lr(u[i],t,e,r)}function cr(n,t,e){var r=n.r+e.r,u=t.x-n.x,i=t.y-n.y;if(r&&(u||i)){var o=t.r+e.r,a=u*u+i*i;o*=o,r*=r;var l=.5+(r-o)/(2*a),c=Math.sqrt(Math.max(0,2*o*(r+a)-(r-=a)*r-o*o))/(2*a);e.x=n.x+l*u+c*i,e.y=n.y+l*i-c*u}else e.x=n.x+r,e.y=n.y}function fr(n,t){return n.parent==t.parent?1:2}function sr(n){var t=n.children;return t.length?t[0]:n.t}function hr(n){var t,e=n.children;return(t=e.length)?e[t-1]:n.t}function gr(n,t,e){var r=e/(t.i-n.i);t.c-=r,t.s+=e,n.c+=r,t.z+=e,t.m+=e}function pr(n){for(var t,e=0,r=0,u=n.children,i=u.length;--i>=0;)t=u[i],t.z+=e,t.m+=e,e+=t.s+(r+=t.c)}function dr(n,t,e){return n.a.parent===t.parent?n.a:e}function vr(n){return 1+Iu.max(n,function(n){return n.y})}function yr(n){return n.reduce(function(n,t){return n+t.x},0)/n.length}function mr(n){var t=n.children;return t&&t.length?mr(t[0]):n}function xr(n){var t,e=n.children;return e&&(t=e.length)?xr(e[t-1]):n}function Mr(n){return{x:n.x,y:n.y,dx:n.dx,dy:n.dy}}function _r(n,t){var e=n.x+t[3],r=n.y+t[0],u=n.dx-t[1]-t[3],i=n.dy-t[0]-t[2];return 0>u&&(e+=u/2,u=0),0>i&&(r+=i/2,i=0),{x:e,y:r,dx:u,dy:i}}function br(n){var t=n[0],e=n[n.length-1];return e>t?[t,e]:[e,t]}function wr(n){return n.rangeExtent?n.rangeExtent():br(n.range())}function kr(n,t,e,r){var u=e(n[0],n[1]),i=r(t[0],t[1]);return function(n){return i(u(n))}}function Nr(n,t){var e,r=0,u=n.length-1,i=n[r],o=n[u];return i>o&&(e=r,r=u,u=e,e=i,i=o,o=e),n[r]=t.floor(i),n[u]=t.ceil(o),n}function Ar(n){return n?{floor:function(t){return Math.floor(t/n)*n},ceil:function(t){return Math.ceil(t/n)*n}}:ko}function Cr(n,t,e,r){var u=[],i=[],o=0,a=Math.min(n.length,t.length)-1;for(n[a]<n[0]&&(n=n.slice().reverse(),t=t.slice().reverse());++o<=a;)u.push(e(n[o-1],n[o])),i.push(r(t[o-1],t[o]));return function(t){var e=Iu.bisect(n,t,1,a)-1;return i[e](u[e](t))}}function zr(n,t,e,r){function u(){var u=Math.min(n.length,t.length)>2?Cr:kr,l=r?ze:Ce;return o=u(n,t,l,e),a=u(t,n,l,Kt),i}function i(n){return o(n)}var o,a;return i.invert=function(n){return a(n)},i.domain=function(t){return arguments.length?(n=t.map(Number),u()):n},i.range=function(n){return arguments.length?(t=n,u()):t},i.rangeRound=function(n){return i.range(n).interpolate(ve)},i.clamp=function(n){return arguments.length?(r=n,u()):r},i.interpolate=function(n){return arguments.length?(e=n,u()):e},i.ticks=function(t){return qr(n,t)},i.tickFormat=function(t,e){return Dr(n,t,e)},i.nice=function(t){return Sr(n,t),u()},i.copy=function(){return zr(n,t,e,r)},u()}function Lr(n,t){return Iu.rebind(n,t,"range","rangeRound","interpolate","clamp")}function Sr(n,t){return Nr(n,Ar(Tr(n,t)[2])),Nr(n,Ar(Tr(n,t)[2])),n}function Tr(n,t){null==t&&(t=10);var e=br(n),r=e[1]-e[0],u=Math.pow(10,Math.floor(Math.log(r/t)/Math.LN10)),i=t/r*u;return.15>=i?u*=10:.35>=i?u*=5:.75>=i&&(u*=2),e[0]=Math.ceil(e[0]/u)*u,e[1]=Math.floor(e[1]/u)*u+.5*u,e[2]=u,e}function qr(n,t){return Iu.range.apply(Iu,Tr(n,t))}function Dr(n,t,e){var r=Tr(n,t);if(e){var u=$i.exec(e);if(u.shift(),"s"===u[8]){var i=Iu.formatPrefix(Math.max(ti(r[0]),ti(r[1])));return u[7]||(u[7]="."+Rr(i.scale(r[2]))),u[8]="f",e=Iu.format(u.join("")),function(n){return e(i.scale(n))+i.symbol}}u[7]||(u[7]="."+Er(u[8],r)),e=u.join("")}else e=",."+Rr(r[2])+"f";return Iu.format(e)}function Rr(n){return-Math.floor(Math.log(n)/Math.LN10+.01)}function Er(n,t){var e=Rr(t[2]);return n in No?Math.abs(e-Rr(Math.max(ti(t[0]),ti(t[1]))))+ +("e"!==n):e-2*("%"===n)}function Ur(n,t,e,r){function u(n){return(e?Math.log(0>n?0:n):-Math.log(n>0?0:-n))/Math.log(t)}function i(n){return e?Math.pow(t,n):-Math.pow(t,-n)}function o(t){return n(u(t))}return o.invert=function(t){return i(n.invert(t))},o.domain=function(t){return arguments.length?(e=t[0]>=0,n.domain((r=t.map(Number)).map(u)),o):r},o.base=function(e){return arguments.length?(t=+e,n.domain(r.map(u)),o):t},o.nice=function(){var t=Nr(r.map(u),e?Math:Co);return n.domain(t),r=t.map(i),o},o.ticks=function(){var n=br(r),o=[],a=n[0],l=n[1],c=Math.floor(u(a)),f=Math.ceil(u(l)),s=t%1?2:t;if(isFinite(f-c)){if(e){for(;f>c;c++)for(var h=1;s>h;h++)o.push(i(c)*h);o.push(i(c))}else for(o.push(i(c));c++<f;)for(var h=s-1;h>0;h--)o.push(i(c)*h);for(c=0;o[c]<a;c++);for(f=o.length;o[f-1]>l;f--);o=o.slice(c,f)}return o},o.tickFormat=function(n,e){if(!arguments.length)return Ao;arguments.length<2?e=Ao:"function"!=typeof e&&(e=Iu.format(e));var r=Math.max(1,t*n/o.ticks().length);return function(n){var o=n/i(Math.round(u(n)));return t-.5>o*t&&(o*=t),r>=o?e(n):""}},o.copy=function(){return Ur(n.copy(),t,e,r)},Lr(o,n)}function Pr(n,t,e){function r(t){return n(u(t))}var u=jr(t),i=jr(1/t);return r.invert=function(t){return i(n.invert(t))},r.domain=function(t){return arguments.length?(n.domain((e=t.map(Number)).map(u)),r):e},r.ticks=function(n){return qr(e,n)},r.tickFormat=function(n,t){return Dr(e,n,t)},r.nice=function(n){return r.domain(Sr(e,n))},r.exponent=function(o){return arguments.length?(u=jr(t=o),i=jr(1/t),n.domain(e.map(u)),r):t},r.copy=function(){return Pr(n.copy(),t,e)},Lr(r,n)}function jr(n){return function(t){return 0>t?-Math.pow(-t,n):Math.pow(t,n)}}function Hr(n,t){function e(e){return i[((u.get(e)||("range"===t.t?u.set(e,n.push(e)):NaN))-1)%i.length]}function r(t,e){return Iu.range(n.length).map(function(n){return t+e*n})}var u,i,o;return e.domain=function(r){if(!arguments.length)return n;n=[],u=new c;for(var i,o=-1,a=r.length;++o<a;)u.has(i=r[o])||u.set(i,n.push(i));return e[t.t].apply(e,t.a)},e.range=function(n){return arguments.length?(i=n,o=0,t={t:"range",a:arguments},e):i},e.rangePoints=function(u,a){arguments.length<2&&(a=0);var l=u[0],c=u[1],f=n.length<2?(l=(l+c)/2,0):(c-l)/(n.length-1+a);return i=r(l+f*a/2,f),o=0,t={t:"rangePoints",a:arguments},e},e.rangeRoundPoints=function(u,a){arguments.length<2&&(a=0);var l=u[0],c=u[1],f=n.length<2?(l=c=Math.round((l+c)/2),0):(c-l)/(n.length-1+a)|0;return i=r(l+Math.round(f*a/2+(c-l-(n.length-1+a)*f)/2),f),o=0,t={t:"rangeRoundPoints",a:arguments},e},e.rangeBands=function(u,a,l){arguments.length<2&&(a=0),arguments.length<3&&(l=a);var c=u[1]<u[0],f=u[c-0],s=u[1-c],h=(s-f)/(n.length-a+2*l);return i=r(f+h*l,h),c&&i.reverse(),o=h*(1-a),t={t:"rangeBands",a:arguments},e},e.rangeRoundBands=function(u,a,l){arguments.length<2&&(a=0),arguments.length<3&&(l=a);var c=u[1]<u[0],f=u[c-0],s=u[1-c],h=Math.floor((s-f)/(n.length-a+2*l));return i=r(f+Math.round((s-f-(n.length-a)*h)/2),h),c&&i.reverse(),o=Math.round(h*(1-a)),t={t:"rangeRoundBands",a:arguments},e},e.rangeBand=function(){return o},e.rangeExtent=function(){return br(t.a[0])},e.copy=function(){return Hr(n,t)},e.domain(n)}function Fr(n,t){function i(){var e=0,r=t.length;for(a=[];++e<r;)a[e-1]=Iu.quantile(n,e/r);return o}function o(n){return isNaN(n=+n)?void 0:t[Iu.bisect(a,n)]}var a;return o.domain=function(t){return arguments.length?(n=t.map(r).filter(u).sort(e),i()):n},o.range=function(n){return arguments.length?(t=n,i()):t},o.quantiles=function(){return a},o.invertExtent=function(e){return e=t.indexOf(e),0>e?[NaN,NaN]:[e>0?a[e-1]:n[0],e<a.length?a[e]:n[n.length-1]]},o.copy=function(){return Fr(n,t)},i()}function Or(n,t,e){function r(t){return e[Math.max(0,Math.min(o,Math.floor(i*(t-n))))]}function u(){return i=e.length/(t-n),o=e.length-1,r}var i,o;return r.domain=function(e){return arguments.length?(n=+e[0],t=+e[e.length-1],u()):[n,t]},r.range=function(n){return arguments.length?(e=n,u()):e},r.invertExtent=function(t){return t=e.indexOf(t),t=0>t?NaN:t/i+n,[t,t+1/i]},r.copy=function(){return Or(n,t,e)},u()}function Yr(n,t){function e(e){return e>=e?t[Iu.bisect(n,e)]:void 0}return e.domain=function(t){return arguments.length?(n=t,e):n},e.range=function(n){return arguments.length?(t=n,e):t},e.invertExtent=function(e){return e=t.indexOf(e),[n[e-1],n[e]]},e.copy=function(){return Yr(n,t)},e}function Ir(n){function t(n){return+n}return t.invert=t,t.domain=t.range=function(e){return arguments.length?(n=e.map(t),t):n},t.ticks=function(t){return qr(n,t)},t.tickFormat=function(t,e){return Dr(n,t,e)},t.copy=function(){return Ir(n)},t}function Zr(){return 0}function Vr(n){return n.innerRadius}function Xr(n){return n.outerRadius}function $r(n){return n.startAngle}function Br(n){return n.endAngle}function Wr(n){return n&&n.padAngle}function Jr(n,t,e,r){return(n-e)*t-(t-r)*n>0?0:1}function Gr(n,t,e,r,u){var i=n[0]-t[0],o=n[1]-t[1],a=(u?r:-r)/Math.sqrt(i*i+o*o),l=a*o,c=-a*i,f=n[0]+l,s=n[1]+c,h=t[0]+l,g=t[1]+c,p=(f+h)/2,d=(s+g)/2,v=h-f,y=g-s,m=v*v+y*y,x=e-r,M=f*g-h*s,_=(0>y?-1:1)*Math.sqrt(Math.max(0,x*x*m-M*M)),b=(M*y-v*_)/m,w=(-M*v-y*_)/m,k=(M*y+v*_)/m,N=(-M*v+y*_)/m,A=b-p,C=w-d,z=k-p,L=N-d;return A*A+C*C>z*z+L*L&&(b=k,w=N),[[b-l,w-c],[b*e/x,w*e/x]]}function Kr(){return!0}function Qr(n){function t(t){function o(){c.push("M",i(n(f),a))}for(var l,c=[],f=[],s=-1,h=t.length,g=kn(e),p=kn(r);++s<h;)u.call(this,l=t[s],s)?f.push([+g.call(this,l,s),+p.call(this,l,s)]):f.length&&(o(),f=[]);return f.length&&o(),c.length?c.join(""):null}var e=at,r=lt,u=Kr,i=nu,o=i.key,a=.7;return t.x=function(n){return arguments.length?(e=n,t):e},t.y=function(n){return arguments.length?(r=n,t):r},t.defined=function(n){return arguments.length?(u=n,t):u},t.interpolate=function(n){return arguments.length?(o="function"==typeof n?i=n:(i=Do.get(n)||nu).key,t):o},t.tension=function(n){return arguments.length?(a=n,t):a},t}function nu(n){return n.length>1?n.join("L"):n+"Z"}function tu(n){return n.join("L")+"Z"}function eu(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("H",(r[0]+(r=n[t])[0])/2,"V",r[1]);return e>1&&u.push("H",r[0]),u.join("")}function ru(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("V",(r=n[t])[1],"H",r[0]);return u.join("")}function uu(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("H",(r=n[t])[0],"V",r[1]);return u.join("")}function iu(n,t){return n.length<4?nu(n):n[1]+lu(n.slice(1,-1),cu(n,t))}function ou(n,t){return n.length<3?tu(n):n[0]+lu((n.push(n[0]),n),cu([n[n.length-2]].concat(n,[n[1]]),t))}function au(n,t){return n.length<3?nu(n):n[0]+lu(n,cu(n,t))}function lu(n,t){if(t.length<1||n.length!=t.length&&n.length!=t.length+2)return nu(n);var e=n.length!=t.length,r="",u=n[0],i=n[1],o=t[0],a=o,l=1;if(e&&(r+="Q"+(i[0]-2*o[0]/3)+","+(i[1]-2*o[1]/3)+","+i[0]+","+i[1],u=n[1],l=2),t.length>1){a=t[1],i=n[l],l++,r+="C"+(u[0]+o[0])+","+(u[1]+o[1])+","+(i[0]-a[0])+","+(i[1]-a[1])+","+i[0]+","+i[1];for(var c=2;c<t.length;c++,l++)i=n[l],a=t[c],r+="S"+(i[0]-a[0])+","+(i[1]-a[1])+","+i[0]+","+i[1]}if(e){var f=n[l];r+="Q"+(i[0]+2*a[0]/3)+","+(i[1]+2*a[1]/3)+","+f[0]+","+f[1]}return r}function cu(n,t){for(var e,r=[],u=(1-t)/2,i=n[0],o=n[1],a=1,l=n.length;++a<l;)e=i,i=o,o=n[a],r.push([u*(o[0]-e[0]),u*(o[1]-e[1])]);return r}function fu(n){if(n.length<3)return nu(n);var t=1,e=n.length,r=n[0],u=r[0],i=r[1],o=[u,u,u,(r=n[1])[0]],a=[i,i,i,r[1]],l=[u,",",i,"L",pu(Uo,o),",",pu(Uo,a)];for(n.push(n[e-1]);++t<=e;)r=n[t],o.shift(),o.push(r[0]),a.shift(),a.push(r[1]),du(l,o,a);return n.pop(),l.push("L",r),l.join("")}function su(n){if(n.length<4)return nu(n);for(var t,e=[],r=-1,u=n.length,i=[0],o=[0];++r<3;)t=n[r],i.push(t[0]),o.push(t[1]);for(e.push(pu(Uo,i)+","+pu(Uo,o)),--r;++r<u;)t=n[r],i.shift(),i.push(t[0]),o.shift(),o.push(t[1]),du(e,i,o);return e.join("")}function hu(n){for(var t,e,r=-1,u=n.length,i=u+4,o=[],a=[];++r<4;)e=n[r%u],o.push(e[0]),a.push(e[1]);for(t=[pu(Uo,o),",",pu(Uo,a)],--r;++r<i;)e=n[r%u],o.shift(),o.push(e[0]),a.shift(),a.push(e[1]),du(t,o,a);return t.join("")}function gu(n,t){var e=n.length-1;if(e)for(var r,u,i=n[0][0],o=n[0][1],a=n[e][0]-i,l=n[e][1]-o,c=-1;++c<=e;)r=n[c],u=c/e,r[0]=t*r[0]+(1-t)*(i+u*a),r[1]=t*r[1]+(1-t)*(o+u*l);return fu(n)}function pu(n,t){return n[0]*t[0]+n[1]*t[1]+n[2]*t[2]+n[3]*t[3]}function du(n,t,e){n.push("C",pu(Ro,t),",",pu(Ro,e),",",pu(Eo,t),",",pu(Eo,e),",",pu(Uo,t),",",pu(Uo,e))}function vu(n,t){return(t[1]-n[1])/(t[0]-n[0])}function yu(n){for(var t=0,e=n.length-1,r=[],u=n[0],i=n[1],o=r[0]=vu(u,i);++t<e;)r[t]=(o+(o=vu(u=i,i=n[t+1])))/2;return r[t]=o,r}function mu(n){for(var t,e,r,u,i=[],o=yu(n),a=-1,l=n.length-1;++a<l;)t=vu(n[a],n[a+1]),ti(t)<mi?o[a]=o[a+1]=0:(e=o[a]/t,r=o[a+1]/t,u=e*e+r*r,u>9&&(u=3*t/Math.sqrt(u),o[a]=u*e,o[a+1]=u*r));for(a=-1;++a<=l;)u=(n[Math.min(l,a+1)][0]-n[Math.max(0,a-1)][0])/(6*(1+o[a]*o[a])),i.push([u||0,o[a]*u||0]);return i}function xu(n){return n.length<3?nu(n):n[0]+lu(n,mu(n))}function Mu(n){for(var t,e,r,u=-1,i=n.length;++u<i;)t=n[u],e=t[0],r=t[1]-wi,t[0]=e*Math.cos(r),t[1]=e*Math.sin(r);return n}function _u(n){function t(t){function l(){d.push("M",a(n(y),s),f,c(n(v.reverse()),s),"Z")}for(var h,g,p,d=[],v=[],y=[],m=-1,x=t.length,M=kn(e),_=kn(u),b=e===r?function(){return g}:kn(r),w=u===i?function(){return p}:kn(i);++m<x;)o.call(this,h=t[m],m)?(v.push([g=+M.call(this,h,m),p=+_.call(this,h,m)]),y.push([+b.call(this,h,m),+w.call(this,h,m)])):v.length&&(l(),v=[],y=[]);return v.length&&l(),d.length?d.join(""):null}var e=at,r=at,u=0,i=lt,o=Kr,a=nu,l=a.key,c=a,f="L",s=.7;return t.x=function(n){return arguments.length?(e=r=n,t):r},t.x0=function(n){return arguments.length?(e=n,t):e},t.x1=function(n){return arguments.length?(r=n,t):r},t.y=function(n){return arguments.length?(u=i=n,t):i},t.y0=function(n){return arguments.length?(u=n,t):u},t.y1=function(n){return arguments.length?(i=n,t):i},t.defined=function(n){return arguments.length?(o=n,t):o},t.interpolate=function(n){return arguments.length?(l="function"==typeof n?a=n:(a=Do.get(n)||nu).key,c=a.reverse||a,f=a.closed?"M":"L",t):l},t.tension=function(n){return arguments.length?(s=n,t):s},t}function bu(n){return n.source}function wu(n){return n.target}function ku(n){return n.radius}function Nu(n){return[n.x,n.y]}function Au(n){return function(){var t=n.apply(this,arguments),e=t[0],r=t[1]-wi;return[e*Math.cos(r),e*Math.sin(r)]}}function Cu(){return 64}function zu(){return"circle"}function Lu(n){var t=Math.sqrt(n/Mi);return"M0,"+t+"A"+t+","+t+" 0 1,1 0,"+-t+"A"+t+","+t+" 0 1,1 0,"+t+"Z"}function Su(n){return function(){var t,e,r;(t=this[n])&&(r=t[e=t.active])&&(r.timer.c=null,r.timer.t=NaN,--t.count?delete t[e]:delete this[n],t.active+=.5,r.event&&r.event.interrupt.call(this,this.__data__,r.index))}}function Tu(n,t,e){return oi(n,Io),n.namespace=t,n.id=e,n}function qu(n,t,e,r){var u=n.id,i=n.namespace;return I(n,"function"==typeof e?function(n,o,a){n[i][u].tween.set(t,r(e.call(n,n.__data__,o,a)))}:(e=r(e),function(n){n[i][u].tween.set(t,e)}))}function Du(n){return null==n&&(n=""),function(){this.textContent=n}}function Ru(n){return null==n?"__transition__":"__transition_"+n+"__"}function Eu(n,t,e,r,u){function i(n){var t=d.delay;return f.t=t+l,n>=t?o(n-t):void(f.c=o)}function o(e){var u=p.active,i=p[u];i&&(i.timer.c=null,i.timer.t=NaN,--p.count,delete p[u],i.event&&i.event.interrupt.call(n,n.__data__,i.index));for(var o in p)if(r>+o){var c=p[o];c.timer.c=null,c.timer.t=NaN,--p.count,delete p[o]}f.c=a,Ln(function(){return f.c&&a(e||1)&&(f.c=null,f.t=NaN),1},0,l),p.active=r,d.event&&d.event.start.call(n,n.__data__,t),g=[],d.tween.forEach(function(e,r){(r=r.call(n,n.__data__,t))&&g.push(r)}),h=d.ease,s=d.duration}function a(u){for(var i=u/s,o=h(i),a=g.length;a>0;)g[--a].call(n,o);return i>=1?(d.event&&d.event.end.call(n,n.__data__,t),--p.count?delete p[r]:delete n[e],1):void 0}var l,f,s,h,g,p=n[e]||(n[e]={active:0,count:0}),d=p[r];d||(l=u.time,f=Ln(i,0,l),d=p[r]={tween:new c,time:l,timer:f,delay:u.delay,duration:u.duration,ease:u.ease,index:t},u=null,++p.count)}function Uu(n,t,e){n.attr("transform",function(n){var r=t(n);return"translate("+(isFinite(r)?r:e(n))+",0)"})}function Pu(n,t,e){n.attr("transform",function(n){var r=t(n);return"translate(0,"+(isFinite(r)?r:e(n))+")"})}function ju(n){return n.toISOString()}function Hu(n,t,e){function r(t){return n(t)}function u(n,e){var r=n[1]-n[0],u=r/e,i=Iu.bisect(Ko,u);return i==Ko.length?[t.year,Tr(n.map(function(n){return n/31536e6}),e)[2]]:i?t[u/Ko[i-1]<Ko[i]/u?i-1:i]:[ta,Tr(n,e)[2]]}return r.invert=function(t){return Fu(n.invert(t))},r.domain=function(t){return arguments.length?(n.domain(t),r):n.domain().map(Fu)},r.nice=function(n,t){function e(e){return!isNaN(e)&&!n.range(e,Fu(+e+1),t).length}var i=r.domain(),o=br(i),a=null==n?u(o,10):"number"==typeof n&&u(o,n);return a&&(n=a[0],t=a[1]),r.domain(Nr(i,t>1?{floor:function(t){for(;e(t=n.floor(t));)t=Fu(t-1);return t},ceil:function(t){for(;e(t=n.ceil(t));)t=Fu(+t+1);return t}}:n))},r.ticks=function(n,t){var e=br(r.domain()),i=null==n?u(e,10):"number"==typeof n?u(e,n):!n.range&&[{range:n},t];return i&&(n=i[0],t=i[1]),n.range(e[0],Fu(+e[1]+1),1>t?1:t)},r.tickFormat=function(){return e},r.copy=function(){return Hu(n.copy(),t,e)},Lr(r,n)}function Fu(n){return new Date(n)}function Ou(n){return JSON.parse(n.responseText)}function Yu(n){var t=Xu.createRange();return t.selectNode(Xu.body),t.createContextualFragment(n.responseText)}var Iu={version:"3.7.0"},Zu=[].slice,Vu=function(n){return Zu.call(n)},Xu=this.document;if(Xu)try{Vu(Xu.documentElement.childNodes)[0].nodeType}catch($u){Vu=function(n){for(var t=n.length,e=new Array(t);t--;)e[t]=n[t];return e}}if(Date.now||(Date.now=function(){return+new Date}),Xu)try{Xu.createElement("DIV").style.setProperty("opacity",0,"")}catch(Bu){var Wu=this.Element.prototype,Ju=Wu.setAttribute,Gu=Wu.setAttributeNS,Ku=this.CSSStyleDeclaration.prototype,Qu=Ku.setProperty;Wu.setAttribute=function(n,t){Ju.call(this,n,t+"")},Wu.setAttributeNS=function(n,t,e){Gu.call(this,n,t,e+"")},Ku.setProperty=function(n,t,e){Qu.call(this,n,t+"",e)}}Iu.ascending=e,Iu.descending=function(n,t){return n>t?-1:t>n?1:t>=n?0:NaN},Iu.min=function(n,t){var e,r,u=-1,i=n.length;if(1===arguments.length){for(;++u<i;)if(null!=(r=n[u])&&r>=r){e=r;break}for(;++u<i;)null!=(r=n[u])&&e>r&&(e=r)}else{for(;++u<i;)if(null!=(r=t.call(n,n[u],u))&&r>=r){e=r;break}for(;++u<i;)null!=(r=t.call(n,n[u],u))&&e>r&&(e=r)}return e},Iu.max=function(n,t){var e,r,u=-1,i=n.length;if(1===arguments.length){for(;++u<i;)if(null!=(r=n[u])&&r>=r){e=r;break}for(;++u<i;)null!=(r=n[u])&&r>e&&(e=r)}else{for(;++u<i;)if(null!=(r=t.call(n,n[u],u))&&r>=r){e=r;break}for(;++u<i;)null!=(r=t.call(n,n[u],u))&&r>e&&(e=r)}return e},Iu.extent=function(n,t){var e,r,u,i=-1,o=n.length;if(1===arguments.length){for(;++i<o;)if(null!=(r=n[i])&&r>=r){e=u=r;break}for(;++i<o;)null!=(r=n[i])&&(e>r&&(e=r),r>u&&(u=r))}else{for(;++i<o;)if(null!=(r=t.call(n,n[i],i))&&r>=r){e=u=r;break}for(;++i<o;)null!=(r=t.call(n,n[i],i))&&(e>r&&(e=r),r>u&&(u=r))}return[e,u]},Iu.sum=function(n,t){var e,r=0,i=n.length,o=-1;if(1===arguments.length)for(;++o<i;)u(e=+n[o])&&(r+=e);else for(;++o<i;)u(e=+t.call(n,n[o],o))&&(r+=e);return r},Iu.mean=function(n,t){var e,i=0,o=n.length,a=-1,l=o;if(1===arguments.length)for(;++a<o;)u(e=r(n[a]))?i+=e:--l;else for(;++a<o;)u(e=r(t.call(n,n[a],a)))?i+=e:--l;return l?i/l:void 0},Iu.quantile=function(n,t){var e=(n.length-1)*t+1,r=Math.floor(e),u=+n[r-1],i=e-r;return i?u+i*(n[r]-u):u},Iu.median=function(n,t){var i,o=[],a=n.length,l=-1;if(1===arguments.length)for(;++l<a;)u(i=r(n[l]))&&o.push(i);else for(;++l<a;)u(i=r(t.call(n,n[l],l)))&&o.push(i);return o.length?Iu.quantile(o.sort(e),.5):void 0},Iu.variance=function(n,t){var e,i,o=n.length,a=0,l=0,c=-1,f=0;if(1===arguments.length)for(;++c<o;)u(e=r(n[c]))&&(i=e-a,a+=i/++f,l+=i*(e-a));else for(;++c<o;)u(e=r(t.call(n,n[c],c)))&&(i=e-a,a+=i/++f,l+=i*(e-a));return f>1?l/(f-1):void 0},Iu.deviation=function(){var n=Iu.variance.apply(this,arguments);return n?Math.sqrt(n):n};var ni=i(e);Iu.bisectLeft=ni.left,Iu.bisect=Iu.bisectRight=ni.right,Iu.bisector=function(n){return i(1===n.length?function(t,r){return e(n(t),r)}:n)},Iu.shuffle=function(n,t,e){(i=arguments.length)<3&&(e=n.length,2>i&&(t=0));for(var r,u,i=e-t;i;)u=Math.random()*i--|0,r=n[i+t],n[i+t]=n[u+t],n[u+t]=r;return n},Iu.permute=function(n,t){for(var e=t.length,r=new Array(e);e--;)r[e]=n[t[e]];return r},Iu.pairs=function(n){for(var t,e=0,r=n.length-1,u=n[0],i=new Array(0>r?0:r);r>e;)i[e]=[t=u,u=n[++e]];return i},Iu.transpose=function(n){if(!(u=n.length))return[];for(var t=-1,e=Iu.min(n,o),r=new Array(e);++t<e;)for(var u,i=-1,a=r[t]=new Array(u);++i<u;)a[i]=n[i][t];return r},Iu.zip=function(){return Iu.transpose(arguments)},Iu.keys=function(n){var t=[];for(var e in n)t.push(e);return t},Iu.values=function(n){var t=[];for(var e in n)t.push(n[e]);return t},Iu.entries=function(n){var t=[];for(var e in n)t.push({key:e,value:n[e]});return t},Iu.merge=function(n){for(var t,e,r,u=n.length,i=-1,o=0;++i<u;)o+=n[i].length;for(e=new Array(o);--u>=0;)for(r=n[u],t=r.length;--t>=0;)e[--o]=r[t];return e};var ti=Math.abs;Iu.range=function(n,t,e){if(arguments.length<3&&(e=1,arguments.length<2&&(t=n,n=0)),(t-n)/e===1/0)throw new Error("infinite range");var r,u=[],i=a(ti(e)),o=-1;if(n*=i,t*=i,e*=i,0>e)for(;(r=n+e*++o)>t;)u.push(r/i);else for(;(r=n+e*++o)<t;)u.push(r/i);return u},Iu.map=function(n,t){var e=new c;if(n instanceof c)n.forEach(function(n,t){e.set(n,t)});else if(Array.isArray(n)){var r,u=-1,i=n.length;if(1===arguments.length)for(;++u<i;)e.set(u,n[u]);else for(;++u<i;)e.set(t.call(n,r=n[u],u),r)}else for(var o in n)e.set(o,n[o]);return e};var ei="__proto__",ri="\x00";l(c,{has:h,get:function(n){return this._[f(n)]},set:function(n,t){return this._[f(n)]=t},remove:g,keys:p,values:function(){var n=[];for(var t in this._)n.push(this._[t]);return n},entries:function(){var n=[];for(var t in this._)n.push({key:s(t),value:this._[t]});return n},size:d,empty:v,forEach:function(n){for(var t in this._)n.call(this,s(t),this._[t])}}),Iu.nest=function(){function n(t,o,a){if(a>=i.length)return r?r.call(u,o):e?o.sort(e):o;for(var l,f,s,h,g=-1,p=o.length,d=i[a++],v=new c;++g<p;)(h=v.get(l=d(f=o[g])))?h.push(f):v.set(l,[f]);return t?(f=t(),s=function(e,r){f.set(e,n(t,r,a))}):(f={},s=function(e,r){f[e]=n(t,r,a)}),v.forEach(s),f}function t(n,e){if(e>=i.length)return n;var r=[],u=o[e++];return n.forEach(function(n,u){r.push({key:n,values:t(u,e)})}),u?r.sort(function(n,t){return u(n.key,t.key)}):r}var e,r,u={},i=[],o=[];return u.map=function(t,e){return n(e,t,0)},u.entries=function(e){return t(n(Iu.map,e,0),0)},u.key=function(n){return i.push(n),u},u.sortKeys=function(n){return o[i.length-1]=n,u},u.sortValues=function(n){return e=n,u},u.rollup=function(n){return r=n,u},u},Iu.set=function(n){var t=new y;if(n)for(var e=0,r=n.length;r>e;++e)t.add(n[e]);return t},l(y,{has:h,add:function(n){return this._[f(n+="")]=!0,n},remove:g,values:p,size:d,empty:v,forEach:function(n){for(var t in this._)n.call(this,s(t))}}),Iu.behavior={},Iu.rebind=function(n,t){for(var e,r=1,u=arguments.length;++r<u;)n[e=arguments[r]]=x(n,t,t[e]);return n};var ui=["webkit","ms","moz","Moz","o","O"];Iu.dispatch=function(){for(var n=new b,t=-1,e=arguments.length;++t<e;)n[arguments[t]]=w(n);return n},b.prototype.on=function(n,t){var e=n.indexOf("."),r="";if(e>=0&&(r=n.slice(e+1),n=n.slice(0,e)),n)return arguments.length<2?this[n].on(r):this[n].on(r,t);if(2===arguments.length){if(null==t)for(n in this)this.hasOwnProperty(n)&&this[n].on(r,null);return this}},Iu.event=null,Iu.requote=function(n){return n.replace(ii,"\\$&")};var ii=/[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g,oi={}.__proto__?function(n,t){n.__proto__=t}:function(n,t){for(var e in t)n[e]=t[e]},ai=function(n,t){return t.querySelector(n)},li=function(n,t){return t.querySelectorAll(n)},ci=function(n,t){var e=n.matches||n[M(n,"matchesSelector")];return(ci=function(n,t){return e.call(n,t)})(n,t)};"function"==typeof Sizzle&&(ai=function(n,t){return Sizzle(n,t)[0]||null},li=Sizzle,ci=Sizzle.matchesSelector),Iu.selection=function(){return Iu.select(Xu.documentElement)};var fi=Iu.selection.prototype=[];fi.select=function(n){var t,e,r,u,i=[];n=z(n);for(var o=-1,a=this.length;++o<a;){i.push(t=[]),t.parentNode=(r=this[o]).parentNode;for(var l=-1,c=r.length;++l<c;)(u=r[l])?(t.push(e=n.call(u,u.__data__,l,o)),e&&"__data__"in u&&(e.__data__=u.__data__)):t.push(null)}return C(i)},fi.selectAll=function(n){var t,e,r=[];n=L(n);for(var u=-1,i=this.length;++u<i;)for(var o=this[u],a=-1,l=o.length;++a<l;)(e=o[a])&&(r.push(t=Vu(n.call(e,e.__data__,a,u))),t.parentNode=e);return C(r)};var si="http://www.w3.org/1999/xhtml",hi={svg:"http://www.w3.org/2000/svg",xhtml:si,xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace",xmlns:"http://www.w3.org/2000/xmlns/"};Iu.ns={prefix:hi,qualify:function(n){var t=n.indexOf(":"),e=n;return t>=0&&"xmlns"!==(e=n.slice(0,t))&&(n=n.slice(t+1)),hi.hasOwnProperty(e)?{space:hi[e],local:n}:n}},fi.attr=function(n,t){if(arguments.length<2){if("string"==typeof n){var e=this.node();return n=Iu.ns.qualify(n),n.local?e.getAttributeNS(n.space,n.local):e.getAttribute(n)}for(t in n)this.each(S(t,n[t]));return this}return this.each(S(n,t))},fi.classed=function(n,t){if(arguments.length<2){if("string"==typeof n){var e=this.node(),r=(n=D(n)).length,u=-1;if(t=e.classList){for(;++u<r;)if(!t.contains(n[u]))return!1}else for(t=e.getAttribute("class");++u<r;)if(!q(n[u]).test(t))return!1;return!0}for(t in n)this.each(R(t,n[t]));return this}return this.each(R(n,t))},fi.style=function(n,e,r){var u=arguments.length;if(3>u){if("string"!=typeof n){2>u&&(e="");for(r in n)this.each(U(r,n[r],e));return this}if(2>u){var i=this.node();return t(i).getComputedStyle(i,null).getPropertyValue(n)}r=""}return this.each(U(n,e,r))},fi.property=function(n,t){if(arguments.length<2){if("string"==typeof n)return this.node()[n];for(t in n)this.each(P(t,n[t]));return this}return this.each(P(n,t))},fi.text=function(n){return arguments.length?this.each("function"==typeof n?function(){var t=n.apply(this,arguments);this.textContent=null==t?"":t}:null==n?function(){this.textContent=""}:function(){this.textContent=n}):this.node().textContent},fi.html=function(n){return arguments.length?this.each("function"==typeof n?function(){var t=n.apply(this,arguments);this.innerHTML=null==t?"":t}:null==n?function(){this.innerHTML=""}:function(){this.innerHTML=n}):this.node().innerHTML},fi.append=function(n){return n=j(n),this.select(function(){return this.appendChild(n.apply(this,arguments))})},fi.insert=function(n,t){return n=j(n),t=z(t),this.select(function(){return this.insertBefore(n.apply(this,arguments),t.apply(this,arguments)||null)})},fi.remove=function(){return this.each(H)},fi.data=function(n,t){function e(n,e){var r,u,i,o=n.length,s=e.length,h=Math.min(o,s),g=new Array(s),p=new Array(s),d=new Array(o);if(t){var v,y=new c,m=new Array(o);for(r=-1;++r<o;)(u=n[r])&&(y.has(v=t.call(u,u.__data__,r))?d[r]=u:y.set(v,u),m[r]=v);for(r=-1;++r<s;)(u=y.get(v=t.call(e,i=e[r],r)))?u!==!0&&(g[r]=u,u.__data__=i):p[r]=F(i),y.set(v,!0);for(r=-1;++r<o;)r in m&&y.get(m[r])!==!0&&(d[r]=n[r])}else{for(r=-1;++r<h;)u=n[r],i=e[r],u?(u.__data__=i,g[r]=u):p[r]=F(i);for(;s>r;++r)p[r]=F(e[r]);for(;o>r;++r)d[r]=n[r]}p.update=g,p.parentNode=g.parentNode=d.parentNode=n.parentNode,a.push(p),l.push(g),f.push(d)}var r,u,i=-1,o=this.length;if(!arguments.length){for(n=new Array(o=(r=this[0]).length);++i<o;)(u=r[i])&&(n[i]=u.__data__);return n}var a=Z([]),l=C([]),f=C([]);if("function"==typeof n)for(;++i<o;)e(r=this[i],n.call(r,r.parentNode.__data__,i));else for(;++i<o;)e(r=this[i],n);return l.enter=function(){return a},l.exit=function(){return f},l},fi.datum=function(n){return arguments.length?this.property("__data__",n):this.property("__data__")},fi.filter=function(n){var t,e,r,u=[];"function"!=typeof n&&(n=O(n));for(var i=0,o=this.length;o>i;i++){u.push(t=[]),t.parentNode=(e=this[i]).parentNode;for(var a=0,l=e.length;l>a;a++)(r=e[a])&&n.call(r,r.__data__,a,i)&&t.push(r)}return C(u)},fi.order=function(){for(var n=-1,t=this.length;++n<t;)for(var e,r=this[n],u=r.length-1,i=r[u];--u>=0;)(e=r[u])&&(i&&i!==e.nextSibling&&i.parentNode.insertBefore(e,i),i=e);return this},fi.sort=function(n){n=Y.apply(this,arguments);for(var t=-1,e=this.length;++t<e;)this[t].sort(n);return this.order()},fi.each=function(n){return I(this,function(t,e,r){n.call(t,t.__data__,e,r)})},fi.call=function(n){var t=Vu(arguments);return n.apply(t[0]=this,t),this},fi.empty=function(){return!this.node()},fi.node=function(){for(var n=0,t=this.length;t>n;n++)for(var e=this[n],r=0,u=e.length;u>r;r++){var i=e[r];if(i)return i}return null},fi.size=function(){var n=0;return I(this,function(){++n}),n};var gi=[];Iu.selection.enter=Z,Iu.selection.enter.prototype=gi,gi.append=fi.append,gi.empty=fi.empty,gi.node=fi.node,gi.call=fi.call,gi.size=fi.size,gi.select=function(n){for(var t,e,r,u,i,o=[],a=-1,l=this.length;++a<l;){r=(u=this[a]).update,o.push(t=[]),t.parentNode=u.parentNode;for(var c=-1,f=u.length;++c<f;)(i=u[c])?(t.push(r[c]=e=n.call(u.parentNode,i.__data__,c,a)),e.__data__=i.__data__):t.push(null)}return C(o)},gi.insert=function(n,t){return arguments.length<2&&(t=V(this)),fi.insert.call(this,n,t)},Iu.select=function(t){var e;return"string"==typeof t?(e=[ai(t,Xu)],e.parentNode=Xu.documentElement):(e=[t],e.parentNode=n(t)),C([e])},Iu.selectAll=function(n){var t;return"string"==typeof n?(t=Vu(li(n,Xu)),t.parentNode=Xu.documentElement):(t=Vu(n),t.parentNode=null),C([t])},fi.on=function(n,t,e){var r=arguments.length;if(3>r){if("string"!=typeof n){2>r&&(t=!1);for(e in n)this.each(X(e,n[e],t));return this}if(2>r)return(r=this.node()["__on"+n])&&r._;e=!1}return this.each(X(n,t,e))};var pi=Iu.map({mouseenter:"mouseover",mouseleave:"mouseout"});Xu&&pi.forEach(function(n){"on"+n in Xu&&pi.remove(n)});var di,vi=0;Iu.mouse=function(n){return J(n,N())};var yi=this.navigator&&/WebKit/.test(this.navigator.userAgent)?-1:0;Iu.touch=function(n,t,e){if(arguments.length<3&&(e=t,t=N().changedTouches),t)for(var r,u=0,i=t.length;i>u;++u)if((r=t[u]).identifier===e)return J(n,r)},Iu.behavior.drag=function(){function n(){this.on("mousedown.drag",i).on("touchstart.drag",o)}function e(n,t,e,i,o){return function(){function a(){var n,e,r=t(h,d);r&&(n=r[0]-x[0],e=r[1]-x[1],p|=n|e,x=r,g({type:"drag",x:r[0]+c[0],y:r[1]+c[1],dx:n,dy:e}))}function l(){t(h,d)&&(y.on(i+v,null).on(o+v,null),m(p),g({type:"dragend"}))}var c,f=this,s=Iu.event.target.correspondingElement||Iu.event.target,h=f.parentNode,g=r.of(f,arguments),p=0,d=n(),v=".drag"+(null==d?"":"-"+d),y=Iu.select(e(s)).on(i+v,a).on(o+v,l),m=W(s),x=t(h,d);u?(c=u.apply(f,arguments),c=[c.x-x[0],c.y-x[1]]):c=[0,0],g({type:"dragstart"})}}var r=A(n,"drag","dragstart","dragend"),u=null,i=e(_,Iu.mouse,t,"mousemove","mouseup"),o=e(G,Iu.touch,m,"touchmove","touchend");return n.origin=function(t){return arguments.length?(u=t,n):u},Iu.rebind(n,r,"on")},Iu.touches=function(n,t){return arguments.length<2&&(t=N().touches),t?Vu(t).map(function(t){var e=J(n,t);return e.identifier=t.identifier,
-e}):[]};var mi=1e-6,xi=mi*mi,Mi=Math.PI,_i=2*Mi,bi=_i-mi,wi=Mi/2,ki=Mi/180,Ni=180/Mi,Ai=Math.SQRT2,Ci=2,zi=4;Iu.interpolateZoom=function(n,t){var e,r,u=n[0],i=n[1],o=n[2],a=t[0],l=t[1],c=t[2],f=a-u,s=l-i,h=f*f+s*s;if(xi>h)r=Math.log(c/o)/Ai,e=function(n){return[u+n*f,i+n*s,o*Math.exp(Ai*n*r)]};else{var g=Math.sqrt(h),p=(c*c-o*o+zi*h)/(2*o*Ci*g),d=(c*c-o*o-zi*h)/(2*c*Ci*g),v=Math.log(Math.sqrt(p*p+1)-p),y=Math.log(Math.sqrt(d*d+1)-d);r=(y-v)/Ai,e=function(n){var t=n*r,e=tn(v),a=o/(Ci*g)*(e*en(Ai*t+v)-nn(v));return[u+a*f,i+a*s,o*e/tn(Ai*t+v)]}}return e.duration=1e3*r,e},Iu.behavior.zoom=function(){function n(n){n.on(T,s).on(Si+".zoom",g).on("dblclick.zoom",p).on(R,h)}function e(n){return[(n[0]-N.x)/N.k,(n[1]-N.y)/N.k]}function r(n){return[n[0]*N.k+N.x,n[1]*N.k+N.y]}function u(n){N.k=Math.max(z[0],Math.min(z[1],n))}function i(n,t){t=r(t),N.x+=n[0]-t[0],N.y+=n[1]-t[1]}function o(t,e,r,o){t.__chart__={x:N.x,y:N.y,k:N.k},u(Math.pow(2,o)),i(v=e,r),t=Iu.select(t),L>0&&(t=t.transition().duration(L)),t.call(n.event)}function a(){_&&_.domain(M.range().map(function(n){return(n-N.x)/N.k}).map(M.invert)),w&&w.domain(b.range().map(function(n){return(n-N.y)/N.k}).map(b.invert))}function l(n){S++||n({type:"zoomstart"})}function c(n){a(),n({type:"zoom",scale:N.k,translate:[N.x,N.y]})}function f(n){--S||(n({type:"zoomend"}),v=null)}function s(){function n(){a=1,i(Iu.mouse(u),h),c(o)}function r(){s.on(q,null).on(D,null),g(a),f(o)}var u=this,o=E.of(u,arguments),a=0,s=Iu.select(t(u)).on(q,n).on(D,r),h=e(Iu.mouse(u)),g=W(u);Yo.call(u),l(o)}function h(){function n(){var n=Iu.touches(p);return g=N.k,n.forEach(function(n){n.identifier in v&&(v[n.identifier]=e(n))}),n}function t(){var t=Iu.event.target;Iu.select(t).on(M,r).on(_,a),b.push(t);for(var e=Iu.event.changedTouches,u=0,i=e.length;i>u;++u)v[e[u].identifier]=null;var l=n(),c=Date.now();if(1===l.length){if(500>c-x){var f=l[0];o(p,f,v[f.identifier],Math.floor(Math.log(N.k)/Math.LN2)+1),k()}x=c}else if(l.length>1){var f=l[0],s=l[1],h=f[0]-s[0],g=f[1]-s[1];y=h*h+g*g}}function r(){var n,t,e,r,o=Iu.touches(p);Yo.call(p);for(var a=0,l=o.length;l>a;++a,r=null)if(e=o[a],r=v[e.identifier]){if(t)break;n=e,t=r}if(r){var f=(f=e[0]-n[0])*f+(f=e[1]-n[1])*f,s=y&&Math.sqrt(f/y);n=[(n[0]+e[0])/2,(n[1]+e[1])/2],t=[(t[0]+r[0])/2,(t[1]+r[1])/2],u(s*g)}x=null,i(n,t),c(d)}function a(){if(Iu.event.touches.length){for(var t=Iu.event.changedTouches,e=0,r=t.length;r>e;++e)delete v[t[e].identifier];for(var u in v)return void n()}Iu.selectAll(b).on(m,null),w.on(T,s).on(R,h),A(),f(d)}var g,p=this,d=E.of(p,arguments),v={},y=0,m=".zoom-"+Iu.event.changedTouches[0].identifier,M="touchmove"+m,_="touchend"+m,b=[],w=Iu.select(p),A=W(p);t(),l(d),w.on(T,null).on(R,t)}function g(){var n=E.of(this,arguments);m?clearTimeout(m):(Yo.call(this),d=e(v=y||Iu.mouse(this)),l(n)),m=setTimeout(function(){m=null,f(n)},50),k(),u(Math.pow(2,.002*Li())*N.k),i(v,d),c(n)}function p(){var n=Iu.mouse(this),t=Math.log(N.k)/Math.LN2;o(this,n,e(n),Iu.event.shiftKey?Math.ceil(t)-1:Math.floor(t)+1)}var d,v,y,m,x,M,_,b,w,N={x:0,y:0,k:1},C=[960,500],z=Ti,L=250,S=0,T="mousedown.zoom",q="mousemove.zoom",D="mouseup.zoom",R="touchstart.zoom",E=A(n,"zoomstart","zoom","zoomend");return Si||(Si="onwheel"in Xu?(Li=function(){return-Iu.event.deltaY*(Iu.event.deltaMode?120:1)},"wheel"):"onmousewheel"in Xu?(Li=function(){return Iu.event.wheelDelta},"mousewheel"):(Li=function(){return-Iu.event.detail},"MozMousePixelScroll")),n.event=function(n){n.each(function(){var n=E.of(this,arguments),t=N;Fo?Iu.select(this).transition().each("start.zoom",function(){N=this.__chart__||{x:0,y:0,k:1},l(n)}).tween("zoom:zoom",function(){var e=C[0],r=C[1],u=v?v[0]:e/2,i=v?v[1]:r/2,o=Iu.interpolateZoom([(u-N.x)/N.k,(i-N.y)/N.k,e/N.k],[(u-t.x)/t.k,(i-t.y)/t.k,e/t.k]);return function(t){var r=o(t),a=e/r[2];this.__chart__=N={x:u-r[0]*a,y:i-r[1]*a,k:a},c(n)}}).each("interrupt.zoom",function(){f(n)}).each("end.zoom",function(){f(n)}):(this.__chart__=N,l(n),c(n),f(n))})},n.translate=function(t){return arguments.length?(N={x:+t[0],y:+t[1],k:N.k},a(),n):[N.x,N.y]},n.scale=function(t){return arguments.length?(N={x:N.x,y:N.y,k:null},u(+t),a(),n):N.k},n.scaleExtent=function(t){return arguments.length?(z=null==t?Ti:[+t[0],+t[1]],n):z},n.center=function(t){return arguments.length?(y=t&&[+t[0],+t[1]],n):y},n.size=function(t){return arguments.length?(C=t&&[+t[0],+t[1]],n):C},n.duration=function(t){return arguments.length?(L=+t,n):L},n.x=function(t){return arguments.length?(_=t,M=t.copy(),N={x:0,y:0,k:1},n):_},n.y=function(t){return arguments.length?(w=t,b=t.copy(),N={x:0,y:0,k:1},n):w},Iu.rebind(n,E,"on")};var Li,Si,Ti=[0,1/0];Iu.color=rn,rn.prototype.toString=function(){return this.rgb()+""},Iu.hsl=un;var qi=un.prototype=new rn;qi.brighter=function(n){return n=Math.pow(.7,arguments.length?n:1),new un(this.h,this.s,this.l/n)},qi.darker=function(n){return n=Math.pow(.7,arguments.length?n:1),new un(this.h,this.s,n*this.l)},qi.rgb=function(){return on(this.h,this.s,this.l)},Iu.hcl=an;var Di=an.prototype=new rn;Di.brighter=function(n){return new an(this.h,this.c,Math.min(100,this.l+Ri*(arguments.length?n:1)))},Di.darker=function(n){return new an(this.h,this.c,Math.max(0,this.l-Ri*(arguments.length?n:1)))},Di.rgb=function(){return ln(this.h,this.c,this.l).rgb()},Iu.lab=cn;var Ri=18,Ei=.95047,Ui=1,Pi=1.08883,ji=cn.prototype=new rn;ji.brighter=function(n){return new cn(Math.min(100,this.l+Ri*(arguments.length?n:1)),this.a,this.b)},ji.darker=function(n){return new cn(Math.max(0,this.l-Ri*(arguments.length?n:1)),this.a,this.b)},ji.rgb=function(){return fn(this.l,this.a,this.b)},Iu.rgb=dn;var Hi=dn.prototype=new rn;Hi.brighter=function(n){n=Math.pow(.7,arguments.length?n:1);var t=this.r,e=this.g,r=this.b,u=30;return t||e||r?(t&&u>t&&(t=u),e&&u>e&&(e=u),r&&u>r&&(r=u),new dn(Math.min(255,t/n),Math.min(255,e/n),Math.min(255,r/n))):new dn(u,u,u)},Hi.darker=function(n){return n=Math.pow(.7,arguments.length?n:1),new dn(n*this.r,n*this.g,n*this.b)},Hi.hsl=function(){return Mn(this.r,this.g,this.b)},Hi.toString=function(){return"#"+mn(this.r)+mn(this.g)+mn(this.b)};var Fi=Iu.map({aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,rebeccapurple:6697881,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074});Fi.forEach(function(n,t){Fi.set(n,vn(t))}),Iu.functor=kn,Iu.xhr=Nn(m),Iu.dsv=function(n,t){function e(n,e,i){arguments.length<3&&(i=e,e=null);var o=An(n,t,null==e?r:u(e),i);return o.row=function(n){return arguments.length?o.response(null==(e=n)?r:u(n)):e},o}function r(n){return e.parse(n.responseText)}function u(n){return function(t){return e.parse(t.responseText,n)}}function i(t){return t.map(o).join(n)}function o(n){return a.test(n)?'"'+n.replace(/\"/g,'""')+'"':n}var a=new RegExp('["'+n+"\n]"),l=n.charCodeAt(0);return e.parse=function(n,t){var r;return e.parseRows(n,function(n,e){if(r)return r(n,e-1);var u=function(t){for(var e={},r=n.length,u=0;r>u;++u)e[n[u]]=t[u];return e};r=t?function(n,e){return t(u(n),e)}:u})},e.parseRows=function(n,t){function e(){if(f>=c)return o;if(u)return u=!1,i;var t=f;if(34===n.charCodeAt(t)){for(var e=t;e++<c;)if(34===n.charCodeAt(e)){if(34!==n.charCodeAt(e+1))break;++e}f=e+2;var r=n.charCodeAt(e+1);return 13===r?(u=!0,10===n.charCodeAt(e+2)&&++f):10===r&&(u=!0),n.slice(t+1,e).replace(/""/g,'"')}for(;c>f;){var r=n.charCodeAt(f++),a=1;if(10===r)u=!0;else if(13===r)u=!0,10===n.charCodeAt(f)&&(++f,++a);else if(r!==l)continue;return n.slice(t,f-a)}return n.slice(t)}for(var r,u,i={},o={},a=[],c=n.length,f=0,s=0;(r=e())!==o;){for(var h=[];r!==i&&r!==o;)h.push(r),r=e();t&&null==(h=t(h,s++))||a.push(h)}return a},e.format=function(t){if(Array.isArray(t[0]))return e.formatRows(t);var r=new y,u=[];return t.forEach(function(n){for(var t in n)r.has(t)||u.push(r.add(t))}),[u.map(o).join(n)].concat(t.map(function(t){return u.map(function(n){return o(t[n])}).join(n)})).join("\n")},e.formatRows=function(n){return n.map(i).join("\n")},e},Iu.csv=Iu.dsv(",","text/csv"),Iu.tsv=Iu.dsv("	","text/tab-separated-values");var Oi,Yi,Ii,Zi,Vi=this[M(this,"requestAnimationFrame")]||function(n){setTimeout(n,17)};Iu.timer=function(){Ln.apply(this,arguments)},Iu.timer.flush=function(){Tn(),qn()},Iu.round=function(n,t){return t?Math.round(n*(t=Math.pow(10,t)))/t:Math.round(n)};var Xi=["y","z","a","f","p","n","\xb5","m","","k","M","G","T","P","E","Z","Y"].map(Rn);Iu.formatPrefix=function(n,t){var e=0;return(n=+n)&&(0>n&&(n*=-1),t&&(n=Iu.round(n,Dn(n,t))),e=1+Math.floor(1e-12+Math.log(n)/Math.LN10),e=Math.max(-24,Math.min(24,3*Math.floor((e-1)/3)))),Xi[8+e/3]};var $i=/(?:([^{])?([<>=^]))?([+\- ])?([$#])?(0)?(\d+)?(,)?(\.-?\d+)?([a-z%])?/i,Bi=Iu.map({b:function(n){return n.toString(2)},c:function(n){return String.fromCharCode(n)},o:function(n){return n.toString(8)},x:function(n){return n.toString(16)},X:function(n){return n.toString(16).toUpperCase()},g:function(n,t){return n.toPrecision(t)},e:function(n,t){return n.toExponential(t)},f:function(n,t){return n.toFixed(t)},r:function(n,t){return(n=Iu.round(n,Dn(n,t))).toFixed(Math.max(0,Math.min(20,Dn(n*(1+1e-15),t))))}}),Wi=Iu.time={},Ji=Date;Pn.prototype={getDate:function(){return this._.getUTCDate()},getDay:function(){return this._.getUTCDay()},getFullYear:function(){return this._.getUTCFullYear()},getHours:function(){return this._.getUTCHours()},getMilliseconds:function(){return this._.getUTCMilliseconds()},getMinutes:function(){return this._.getUTCMinutes()},getMonth:function(){return this._.getUTCMonth()},getSeconds:function(){return this._.getUTCSeconds()},getTime:function(){return this._.getTime()},getTimezoneOffset:function(){return 0},valueOf:function(){return this._.valueOf()},setDate:function(){Gi.setUTCDate.apply(this._,arguments)},setDay:function(){Gi.setUTCDay.apply(this._,arguments)},setFullYear:function(){Gi.setUTCFullYear.apply(this._,arguments)},setHours:function(){Gi.setUTCHours.apply(this._,arguments)},setMilliseconds:function(){Gi.setUTCMilliseconds.apply(this._,arguments)},setMinutes:function(){Gi.setUTCMinutes.apply(this._,arguments)},setMonth:function(){Gi.setUTCMonth.apply(this._,arguments)},setSeconds:function(){Gi.setUTCSeconds.apply(this._,arguments)},setTime:function(){Gi.setTime.apply(this._,arguments)}};var Gi=Date.prototype;Wi.year=jn(function(n){return n=Wi.day(n),n.setMonth(0,1),n},function(n,t){n.setFullYear(n.getFullYear()+t)},function(n){return n.getFullYear()}),Wi.years=Wi.year.range,Wi.years.utc=Wi.year.utc.range,Wi.day=jn(function(n){var t=new Ji(2e3,0);return t.setFullYear(n.getFullYear(),n.getMonth(),n.getDate()),t},function(n,t){n.setDate(n.getDate()+t)},function(n){return n.getDate()-1}),Wi.days=Wi.day.range,Wi.days.utc=Wi.day.utc.range,Wi.dayOfYear=function(n){var t=Wi.year(n);return Math.floor((n-t-6e4*(n.getTimezoneOffset()-t.getTimezoneOffset()))/864e5)},["sunday","monday","tuesday","wednesday","thursday","friday","saturday"].forEach(function(n,t){t=7-t;var e=Wi[n]=jn(function(n){return(n=Wi.day(n)).setDate(n.getDate()-(n.getDay()+t)%7),n},function(n,t){n.setDate(n.getDate()+7*Math.floor(t))},function(n){var e=Wi.year(n).getDay();return Math.floor((Wi.dayOfYear(n)+(e+t)%7)/7)-(e!==t)});Wi[n+"s"]=e.range,Wi[n+"s"].utc=e.utc.range,Wi[n+"OfYear"]=function(n){var e=Wi.year(n).getDay();return Math.floor((Wi.dayOfYear(n)+(e+t)%7)/7)}}),Wi.week=Wi.sunday,Wi.weeks=Wi.sunday.range,Wi.weeks.utc=Wi.sunday.utc.range,Wi.weekOfYear=Wi.sundayOfYear;var Ki={"-":"",_:" ",0:"0"},Qi=/^\s*\d+/,no=/^%/;Iu.locale=function(n){return{numberFormat:En(n),timeFormat:Fn(n)}};var to=Iu.locale({decimal:".",thousands:",",grouping:[3],currency:["$",""],dateTime:"%a %b %e %X %Y",date:"%m/%d/%Y",time:"%H:%M:%S",periods:["AM","PM"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]});Iu.format=to.numberFormat,Iu.geom={},Iu.geom.hull=function(n){function t(n){if(n.length<3)return[];var t,u=kn(e),i=kn(r),o=n.length,a=[],l=[];for(t=0;o>t;t++)a.push([+u.call(this,n[t],t),+i.call(this,n[t],t),t]);for(a.sort(ft),t=0;o>t;t++)l.push([a[t][0],-a[t][1]]);var c=ct(a),f=ct(l),s=f[0]===c[0],h=f[f.length-1]===c[c.length-1],g=[];for(t=c.length-1;t>=0;--t)g.push(n[a[c[t]][2]]);for(t=+s;t<f.length-h;++t)g.push(n[a[f[t]][2]]);return g}var e=at,r=lt;return arguments.length?t(n):(t.x=function(n){return arguments.length?(e=n,t):e},t.y=function(n){return arguments.length?(r=n,t):r},t)},Iu.geom.polygon=function(n){return oi(n,eo),n};var eo=Iu.geom.polygon.prototype=[];eo.area=function(){for(var n,t=-1,e=this.length,r=this[e-1],u=0;++t<e;)n=r,r=this[t],u+=n[1]*r[0]-n[0]*r[1];return.5*u},eo.centroid=function(n){var t,e,r=-1,u=this.length,i=0,o=0,a=this[u-1];for(arguments.length||(n=-1/(6*this.area()));++r<u;)t=a,a=this[r],e=t[0]*a[1]-a[0]*t[1],i+=(t[0]+a[0])*e,o+=(t[1]+a[1])*e;return[i*n,o*n]},eo.clip=function(n){for(var t,e,r,u,i,o,a=gt(n),l=-1,c=this.length-gt(this),f=this[c-1];++l<c;){for(t=n.slice(),n.length=0,u=this[l],i=t[(r=t.length-a)-1],e=-1;++e<r;)o=t[e],st(o,f,u)?(st(i,f,u)||n.push(ht(i,o,f,u)),n.push(o)):st(i,f,u)&&n.push(ht(i,o,f,u)),i=o;a&&n.push(n[0]),f=u}return n};var ro,uo,io,oo,ao,lo=[],co=[];_t.prototype.prepare=function(){for(var n,t=this.edges,e=t.length;e--;)n=t[e].edge,n.b&&n.a||t.splice(e,1);return t.sort(wt),t.length},Rt.prototype={start:function(){return this.edge.l===this.site?this.edge.a:this.edge.b},end:function(){return this.edge.l===this.site?this.edge.b:this.edge.a}},Et.prototype={insert:function(n,t){var e,r,u;if(n){if(t.P=n,t.N=n.N,n.N&&(n.N.P=t),n.N=t,n.R){for(n=n.R;n.L;)n=n.L;n.L=t}else n.R=t;e=n}else this._?(n=Ht(this._),t.P=null,t.N=n,n.P=n.L=t,e=n):(t.P=t.N=null,this._=t,e=null);for(t.L=t.R=null,t.U=e,t.C=!0,n=t;e&&e.C;)r=e.U,e===r.L?(u=r.R,u&&u.C?(e.C=u.C=!1,r.C=!0,n=r):(n===e.R&&(Pt(this,e),n=e,e=n.U),e.C=!1,r.C=!0,jt(this,r))):(u=r.L,u&&u.C?(e.C=u.C=!1,r.C=!0,n=r):(n===e.L&&(jt(this,e),n=e,e=n.U),e.C=!1,r.C=!0,Pt(this,r))),e=n.U;this._.C=!1},remove:function(n){n.N&&(n.N.P=n.P),n.P&&(n.P.N=n.N),n.N=n.P=null;var t,e,r,u=n.U,i=n.L,o=n.R;if(e=i?o?Ht(o):i:o,u?u.L===n?u.L=e:u.R=e:this._=e,i&&o?(r=e.C,e.C=n.C,e.L=i,i.U=e,e!==o?(u=e.U,e.U=n.U,n=e.R,u.L=n,e.R=o,o.U=e):(e.U=u,u=e,n=e.R)):(r=n.C,n=e),n&&(n.U=u),!r){if(n&&n.C)return void(n.C=!1);do{if(n===this._)break;if(n===u.L){if(t=u.R,t.C&&(t.C=!1,u.C=!0,Pt(this,u),t=u.R),t.L&&t.L.C||t.R&&t.R.C){t.R&&t.R.C||(t.L.C=!1,t.C=!0,jt(this,t),t=u.R),t.C=u.C,u.C=t.R.C=!1,Pt(this,u),n=this._;break}}else if(t=u.L,t.C&&(t.C=!1,u.C=!0,jt(this,u),t=u.L),t.L&&t.L.C||t.R&&t.R.C){t.L&&t.L.C||(t.R.C=!1,t.C=!0,Pt(this,t),t=u.L),t.C=u.C,u.C=t.L.C=!1,jt(this,u),n=this._;break}t.C=!0,n=u,u=u.U}while(!n.C);n&&(n.C=!1)}}},Iu.geom.voronoi=function(n){function t(n){var t=new Array(n.length),r=a[0][0],u=a[0][1],i=a[1][0],o=a[1][1];return Ft(e(n),a).cells.forEach(function(e,a){var l=e.edges,c=e.site,f=t[a]=l.length?l.map(function(n){var t=n.start();return[t.x,t.y]}):c.x>=r&&c.x<=i&&c.y>=u&&c.y<=o?[[r,o],[i,o],[i,u],[r,u]]:[];f.point=n[a]}),t}function e(n){return n.map(function(n,t){return{x:Math.round(i(n,t)/mi)*mi,y:Math.round(o(n,t)/mi)*mi,i:t}})}var r=at,u=lt,i=r,o=u,a=fo;return n?t(n):(t.links=function(n){return Ft(e(n)).edges.filter(function(n){return n.l&&n.r}).map(function(t){return{source:n[t.l.i],target:n[t.r.i]}})},t.triangles=function(n){var t=[];return Ft(e(n)).cells.forEach(function(e,r){for(var u,i,o=e.site,a=e.edges.sort(wt),l=-1,c=a.length,f=a[c-1].edge,s=f.l===o?f.r:f.l;++l<c;)u=f,i=s,f=a[l].edge,s=f.l===o?f.r:f.l,r<i.i&&r<s.i&&Yt(o,i,s)<0&&t.push([n[r],n[i.i],n[s.i]])}),t},t.x=function(n){return arguments.length?(i=kn(r=n),t):r},t.y=function(n){return arguments.length?(o=kn(u=n),t):u},t.clipExtent=function(n){return arguments.length?(a=null==n?fo:n,t):a===fo?null:a},t.size=function(n){return arguments.length?t.clipExtent(n&&[[0,0],n]):a===fo?null:a&&a[1]},t)};var fo=[[-1e6,-1e6],[1e6,1e6]];Iu.geom.delaunay=function(n){return Iu.geom.voronoi().triangles(n)},Iu.geom.quadtree=function(n,t,e,r,u){function i(n){function i(n,t,e,r,u,i,o,a){if(!isNaN(e)&&!isNaN(r))if(n.leaf){var l=n.x,f=n.y;if(null!=l)if(ti(l-e)+ti(f-r)<.01)c(n,t,e,r,u,i,o,a);else{var s=n.point;n.x=n.y=n.point=null,c(n,s,l,f,u,i,o,a),c(n,t,e,r,u,i,o,a)}else n.x=e,n.y=r,n.point=t}else c(n,t,e,r,u,i,o,a)}function c(n,t,e,r,u,o,a,l){var c=.5*(u+a),f=.5*(o+l),s=e>=c,h=r>=f,g=h<<1|s;n.leaf=!1,n=n.nodes[g]||(n.nodes[g]=Vt()),s?u=c:a=c,h?o=f:l=f,i(n,t,e,r,u,o,a,l)}var f,s,h,g,p,d,v,y,m,x=kn(a),M=kn(l);if(null!=t)d=t,v=e,y=r,m=u;else if(y=m=-(d=v=1/0),s=[],h=[],p=n.length,o)for(g=0;p>g;++g)f=n[g],f.x<d&&(d=f.x),f.y<v&&(v=f.y),f.x>y&&(y=f.x),f.y>m&&(m=f.y),s.push(f.x),h.push(f.y);else for(g=0;p>g;++g){var _=+x(f=n[g],g),b=+M(f,g);d>_&&(d=_),v>b&&(v=b),_>y&&(y=_),b>m&&(m=b),s.push(_),h.push(b)}var w=y-d,k=m-v;w>k?m=v+w:y=d+k;var N=Vt();if(N.add=function(n){i(N,n,+x(n,++g),+M(n,g),d,v,y,m)},N.visit=function(n){Xt(n,N,d,v,y,m)},N.find=function(n){return $t(N,n[0],n[1],d,v,y,m)},g=-1,null==t){for(;++g<p;)i(N,n[g],s[g],h[g],d,v,y,m);--g}else n.forEach(N.add);return s=h=n=f=null,N}var o,a=at,l=lt;return(o=arguments.length)?(a=It,l=Zt,3===o&&(u=e,r=t,e=t=0),i(n)):(i.x=function(n){return arguments.length?(a=n,i):a},i.y=function(n){return arguments.length?(l=n,i):l},i.extent=function(n){return arguments.length?(null==n?t=e=r=u=null:(t=+n[0][0],e=+n[0][1],r=+n[1][0],u=+n[1][1]),i):null==t?null:[[t,e],[r,u]]},i.size=function(n){return arguments.length?(null==n?t=e=r=u=null:(t=e=0,r=+n[0],u=+n[1]),i):null==t?null:[r-t,u-e]},i)},Iu.interpolateRgb=Bt,Iu.interpolateObject=Wt,Iu.interpolateNumber=Jt,Iu.interpolateString=Gt;var so=/[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,ho=new RegExp(so.source,"g");Iu.interpolate=Kt,Iu.interpolators=[function(n,t){var e=typeof t;return("string"===e?Fi.has(t.toLowerCase())||/^(#|rgb\(|hsl\()/i.test(t)?Bt:Gt:t instanceof rn?Bt:Array.isArray(t)?Qt:"object"===e&&isNaN(t)?Wt:Jt)(n,t)}],Iu.interpolateArray=Qt;var go=function(){return m},po=Iu.map({linear:go,poly:oe,quad:function(){return re},cubic:function(){return ue},sin:function(){return ae},exp:function(){return le},circle:function(){return ce},elastic:fe,back:se,bounce:function(){return he}}),vo=Iu.map({"in":m,out:te,"in-out":ee,"out-in":function(n){return ee(te(n))}});Iu.ease=function(n){var t=n.indexOf("-"),e=t>=0?n.slice(0,t):n,r=t>=0?n.slice(t+1):"in";return e=po.get(e)||go,r=vo.get(r)||m,ne(r(e.apply(null,Zu.call(arguments,1))))},Iu.interpolateHcl=ge,Iu.interpolateHsl=pe,Iu.interpolateLab=de,Iu.interpolateRound=ve,Iu.transform=function(n){var t=Xu.createElementNS(Iu.ns.prefix.svg,"g");return(Iu.transform=function(n){if(null!=n){t.setAttribute("transform",n);var e=t.transform.baseVal.consolidate()}return new ye(e?e.matrix:yo)})(n)},ye.prototype.toString=function(){return"translate("+this.translate+")rotate("+this.rotate+")skewX("+this.skew+")scale("+this.scale+")"};var yo={a:1,b:0,c:0,d:1,e:0,f:0};Iu.interpolateTransform=Ae,Iu.layout={},Iu.layout.bundle=function(){return function(n){for(var t=[],e=-1,r=n.length;++e<r;)t.push(Le(n[e]));return t}},Iu.layout.chord=function(){function n(){var n,c,s,h,g,p={},d=[],v=Iu.range(i),y=[];for(e=[],r=[],n=0,h=-1;++h<i;){for(c=0,g=-1;++g<i;)c+=u[h][g];d.push(c),y.push(Iu.range(i)),n+=c}for(o&&v.sort(function(n,t){return o(d[n],d[t])}),a&&y.forEach(function(n,t){n.sort(function(n,e){return a(u[t][n],u[t][e])})}),n=(_i-f*i)/n,c=0,h=-1;++h<i;){for(s=c,g=-1;++g<i;){var m=v[h],x=y[m][g],M=u[m][x],_=c,b=c+=M*n;p[m+"-"+x]={index:m,subindex:x,startAngle:_,endAngle:b,value:M}}r[m]={index:m,startAngle:s,endAngle:c,value:d[m]},c+=f}for(h=-1;++h<i;)for(g=h-1;++g<i;){var w=p[h+"-"+g],k=p[g+"-"+h];(w.value||k.value)&&e.push(w.value<k.value?{source:k,target:w}:{source:w,target:k})}l&&t()}function t(){e.sort(function(n,t){return l((n.source.value+n.target.value)/2,(t.source.value+t.target.value)/2)})}var e,r,u,i,o,a,l,c={},f=0;return c.matrix=function(n){return arguments.length?(i=(u=n)&&u.length,e=r=null,c):u},c.padding=function(n){return arguments.length?(f=n,e=r=null,c):f},c.sortGroups=function(n){return arguments.length?(o=n,e=r=null,c):o},c.sortSubgroups=function(n){return arguments.length?(a=n,e=null,c):a},c.sortChords=function(n){return arguments.length?(l=n,e&&t(),c):l},c.chords=function(){return e||n(),e},c.groups=function(){return r||n(),r},c},Iu.layout.force=function(){function n(n){return function(t,e,r,u){if(t.point!==n){var i=t.cx-n.x,o=t.cy-n.y,a=u-e,l=i*i+o*o;if(l>a*a/y){if(d>l){var c=t.charge/l;n.px-=i*c,n.py-=o*c}return!0}if(t.point&&l&&d>l){var c=t.pointCharge/l;n.px-=i*c,n.py-=o*c}}return!t.charge}}function t(n){n.px=Iu.event.x,n.py=Iu.event.y,l.resume()}var e,r,u,i,o,a,l={},c=Iu.dispatch("start","tick","end"),f=[1,1],s=.9,h=mo,g=xo,p=-30,d=Mo,v=.1,y=.64,x=[],M=[];return l.tick=function(){if((u*=.99)<.005)return e=null,c.end({type:"end",alpha:u=0}),!0;var t,r,l,h,g,d,y,m,_,b=x.length,w=M.length;for(r=0;w>r;++r)l=M[r],h=l.source,g=l.target,m=g.x-h.x,_=g.y-h.y,(d=m*m+_*_)&&(d=u*o[r]*((d=Math.sqrt(d))-i[r])/d,m*=d,_*=d,g.x-=m*(y=h.weight+g.weight?h.weight/(h.weight+g.weight):.5),g.y-=_*y,h.x+=m*(y=1-y),h.y+=_*y);if((y=u*v)&&(m=f[0]/2,_=f[1]/2,r=-1,y))for(;++r<b;)l=x[r],l.x+=(m-l.x)*y,l.y+=(_-l.y)*y;if(p)for(Ue(t=Iu.geom.quadtree(x),u,a),r=-1;++r<b;)(l=x[r]).fixed||t.visit(n(l));for(r=-1;++r<b;)l=x[r],l.fixed?(l.x=l.px,l.y=l.py):(l.x-=(l.px-(l.px=l.x))*s,l.y-=(l.py-(l.py=l.y))*s);c.tick({type:"tick",alpha:u})},l.nodes=function(n){return arguments.length?(x=n,l):x},l.links=function(n){return arguments.length?(M=n,l):M},l.size=function(n){return arguments.length?(f=n,l):f},l.linkDistance=function(n){return arguments.length?(h="function"==typeof n?n:+n,l):h},l.distance=l.linkDistance,l.linkStrength=function(n){return arguments.length?(g="function"==typeof n?n:+n,l):g},l.friction=function(n){return arguments.length?(s=+n,l):s},l.charge=function(n){return arguments.length?(p="function"==typeof n?n:+n,l):p},l.chargeDistance=function(n){return arguments.length?(d=n*n,l):Math.sqrt(d)},l.gravity=function(n){return arguments.length?(v=+n,l):v},l.theta=function(n){return arguments.length?(y=n*n,l):Math.sqrt(y)},l.alpha=function(n){return arguments.length?(n=+n,u?n>0?u=n:(e.c=null,e.t=NaN,e=null,c.end({type:"end",alpha:u=0})):n>0&&(c.start({type:"start",alpha:u=n}),e=Ln(l.tick)),l):u},l.start=function(){function n(n,r){if(!e){for(e=new Array(u),l=0;u>l;++l)e[l]=[];for(l=0;c>l;++l){var i=M[l];e[i.source.index].push(i.target),e[i.target.index].push(i.source)}}for(var o,a=e[t],l=-1,f=a.length;++l<f;)if(!isNaN(o=a[l][n]))return o;return Math.random()*r}var t,e,r,u=x.length,c=M.length,s=f[0],d=f[1];for(t=0;u>t;++t)(r=x[t]).index=t,r.weight=0;for(t=0;c>t;++t)r=M[t],"number"==typeof r.source&&(r.source=x[r.source]),"number"==typeof r.target&&(r.target=x[r.target]),++r.source.weight,++r.target.weight;for(t=0;u>t;++t)r=x[t],isNaN(r.x)&&(r.x=n("x",s)),isNaN(r.y)&&(r.y=n("y",d)),isNaN(r.px)&&(r.px=r.x),isNaN(r.py)&&(r.py=r.y);if(i=[],"function"==typeof h)for(t=0;c>t;++t)i[t]=+h.call(this,M[t],t);else for(t=0;c>t;++t)i[t]=h;if(o=[],"function"==typeof g)for(t=0;c>t;++t)o[t]=+g.call(this,M[t],t);else for(t=0;c>t;++t)o[t]=g;if(a=[],"function"==typeof p)for(t=0;u>t;++t)a[t]=+p.call(this,x[t],t);else for(t=0;u>t;++t)a[t]=p;return l.resume()},l.resume=function(){return l.alpha(.1)},l.stop=function(){return l.alpha(0)},l.drag=function(){return r||(r=Iu.behavior.drag().origin(m).on("dragstart.force",qe).on("drag.force",t).on("dragend.force",De)),arguments.length?void this.on("mouseover.force",Re).on("mouseout.force",Ee).call(r):r},Iu.rebind(l,c,"on")};var mo=20,xo=1,Mo=1/0;Iu.layout.hierarchy=function(){function n(u){var i,o=[u],a=[];for(u.depth=0;null!=(i=o.pop());)if(a.push(i),(c=e.call(n,i,i.depth))&&(l=c.length)){for(var l,c,f;--l>=0;)o.push(f=c[l]),f.parent=i,f.depth=i.depth+1;r&&(i.value=0),i.children=c}else r&&(i.value=+r.call(n,i,i.depth)||0),delete i.children;return He(u,function(n){var e,u;t&&(e=n.children)&&e.sort(t),r&&(u=n.parent)&&(u.value+=n.value)}),a}var t=Ye,e=Fe,r=Oe;return n.sort=function(e){return arguments.length?(t=e,n):t},n.children=function(t){return arguments.length?(e=t,n):e},n.value=function(t){return arguments.length?(r=t,n):r},n.revalue=function(t){return r&&(je(t,function(n){n.children&&(n.value=0)}),He(t,function(t){var e;t.children||(t.value=+r.call(n,t,t.depth)||0),(e=t.parent)&&(e.value+=t.value)})),t},n},Iu.layout.partition=function(){function n(t,e,r,u){var i=t.children;if(t.x=e,t.y=t.depth*u,t.dx=r,t.dy=u,i&&(o=i.length)){var o,a,l,c=-1;for(r=t.value?r/t.value:0;++c<o;)n(a=i[c],e,l=a.value*r,u),e+=l}}function t(n){var e=n.children,r=0;if(e&&(u=e.length))for(var u,i=-1;++i<u;)r=Math.max(r,t(e[i]));return 1+r}function e(e,i){var o=r.call(this,e,i);return n(o[0],0,u[0],u[1]/t(o[0])),o}var r=Iu.layout.hierarchy(),u=[1,1];return e.size=function(n){return arguments.length?(u=n,e):u},Pe(e,r)},Iu.layout.pie=function(){function n(o){var a,l=o.length,c=o.map(function(e,r){return+t.call(n,e,r)}),f=+("function"==typeof r?r.apply(this,arguments):r),s=("function"==typeof u?u.apply(this,arguments):u)-f,h=Math.min(Math.abs(s)/l,+("function"==typeof i?i.apply(this,arguments):i)),g=h*(0>s?-1:1),p=Iu.sum(c),d=p?(s-l*g)/p:0,v=Iu.range(l),y=[];return null!=e&&v.sort(e===_o?function(n,t){return c[t]-c[n]}:function(n,t){return e(o[n],o[t])}),v.forEach(function(n){y[n]={data:o[n],value:a=c[n],startAngle:f,endAngle:f+=a*d+g,padAngle:h}}),y}var t=Number,e=_o,r=0,u=_i,i=0;return n.value=function(e){return arguments.length?(t=e,n):t},n.sort=function(t){return arguments.length?(e=t,n):e},n.startAngle=function(t){return arguments.length?(r=t,n):r},n.endAngle=function(t){return arguments.length?(u=t,n):u},n.padAngle=function(t){return arguments.length?(i=t,n):i},n};var _o={};Iu.layout.stack=function(){function n(a,l){if(!(h=a.length))return a;var c=a.map(function(e,r){return t.call(n,e,r)}),f=c.map(function(t){return t.map(function(t,e){return[i.call(n,t,e),o.call(n,t,e)]})}),s=e.call(n,f,l);c=Iu.permute(c,s),f=Iu.permute(f,s);var h,g,p,d,v=r.call(n,f,l),y=c[0].length;for(p=0;y>p;++p)for(u.call(n,c[0][p],d=v[p],f[0][p][1]),g=1;h>g;++g)u.call(n,c[g][p],d+=f[g-1][p][1],f[g][p][1]);return a}var t=m,e=$e,r=Be,u=Xe,i=Ze,o=Ve;return n.values=function(e){return arguments.length?(t=e,n):t},n.order=function(t){return arguments.length?(e="function"==typeof t?t:bo.get(t)||$e,n):e},n.offset=function(t){return arguments.length?(r="function"==typeof t?t:wo.get(t)||Be,n):r},n.x=function(t){return arguments.length?(i=t,n):i},n.y=function(t){return arguments.length?(o=t,n):o},n.out=function(t){return arguments.length?(u=t,n):u},n};var bo=Iu.map({"inside-out":function(n){var t,e,r=n.length,u=n.map(We),i=n.map(Je),o=Iu.range(r).sort(function(n,t){return u[n]-u[t]}),a=0,l=0,c=[],f=[];for(t=0;r>t;++t)e=o[t],l>a?(a+=i[e],c.push(e)):(l+=i[e],f.push(e));return f.reverse().concat(c)},reverse:function(n){return Iu.range(n.length).reverse()},"default":$e}),wo=Iu.map({silhouette:function(n){var t,e,r,u=n.length,i=n[0].length,o=[],a=0,l=[];for(e=0;i>e;++e){for(t=0,r=0;u>t;t++)r+=n[t][e][1];r>a&&(a=r),o.push(r)}for(e=0;i>e;++e)l[e]=(a-o[e])/2;return l},wiggle:function(n){var t,e,r,u,i,o,a,l,c,f=n.length,s=n[0],h=s.length,g=[];for(g[0]=l=c=0,e=1;h>e;++e){for(t=0,u=0;f>t;++t)u+=n[t][e][1];for(t=0,i=0,a=s[e][0]-s[e-1][0];f>t;++t){for(r=0,o=(n[t][e][1]-n[t][e-1][1])/(2*a);t>r;++r)o+=(n[r][e][1]-n[r][e-1][1])/a;i+=o*n[t][e][1]}g[e]=l-=u?i/u*a:0,c>l&&(c=l)}for(e=0;h>e;++e)g[e]-=c;return g},expand:function(n){var t,e,r,u=n.length,i=n[0].length,o=1/u,a=[];for(e=0;i>e;++e){for(t=0,r=0;u>t;t++)r+=n[t][e][1];if(r)for(t=0;u>t;t++)n[t][e][1]/=r;else for(t=0;u>t;t++)n[t][e][1]=o}for(e=0;i>e;++e)a[e]=0;return a},zero:Be});Iu.layout.histogram=function(){function n(n,i){for(var o,a,l=[],c=n.map(e,this),f=r.call(this,c,i),s=u.call(this,f,c,i),i=-1,h=c.length,g=s.length-1,p=t?1:1/h;++i<g;)o=l[i]=[],o.dx=s[i+1]-(o.x=s[i]),o.y=0;if(g>0)for(i=-1;++i<h;)a=c[i],a>=f[0]&&a<=f[1]&&(o=l[Iu.bisect(s,a,1,g)-1],o.y+=p,o.push(n[i]));return l}var t=!0,e=Number,r=nr,u=Ke;return n.value=function(t){return arguments.length?(e=t,n):e},n.range=function(t){return arguments.length?(r=kn(t),n):r},n.bins=function(t){return arguments.length?(u="number"==typeof t?function(n){return Qe(n,t)}:kn(t),n):u},n.frequency=function(e){return arguments.length?(t=!!e,n):t},n},Iu.layout.pack=function(){function n(n,i){var o=e.call(this,n,i),a=o[0],l=u[0],c=u[1],f=null==t?Math.sqrt:"function"==typeof t?t:function(){return t};if(a.x=a.y=0,He(a,function(n){n.r=+f(n.value)}),He(a,ir),r){var s=r*(t?1:Math.max(2*a.r/l,2*a.r/c))/2;He(a,function(n){n.r+=s}),He(a,ir),He(a,function(n){n.r-=s})}return lr(a,l/2,c/2,t?1:1/Math.max(2*a.r/l,2*a.r/c)),o}var t,e=Iu.layout.hierarchy().sort(tr),r=0,u=[1,1];return n.size=function(t){return arguments.length?(u=t,n):u},n.radius=function(e){return arguments.length?(t=null==e||"function"==typeof e?e:+e,n):t},n.padding=function(t){return arguments.length?(r=+t,n):r},Pe(n,e)},Iu.layout.tree=function(){function n(n,u){var f=o.call(this,n,u),s=f[0],h=t(s);if(He(h,e),h.parent.m=-h.z,je(h,r),c)je(s,i);else{var g=s,p=s,d=s;je(s,function(n){n.x<g.x&&(g=n),n.x>p.x&&(p=n),n.depth>d.depth&&(d=n)});var v=a(g,p)/2-g.x,y=l[0]/(p.x+a(p,g)/2+v),m=l[1]/(d.depth||1);je(s,function(n){n.x=(n.x+v)*y,n.y=n.depth*m})}return f}function t(n){for(var t,e={A:null,children:[n]},r=[e];null!=(t=r.pop());)for(var u,i=t.children,o=0,a=i.length;a>o;++o)r.push((i[o]=u={
-_:i[o],parent:t,children:(u=i[o].children)&&u.slice()||[],A:null,a:null,z:0,m:0,c:0,s:0,t:null,i:o}).a=u);return e.children[0]}function e(n){var t=n.children,e=n.parent.children,r=n.i?e[n.i-1]:null;if(t.length){pr(n);var i=(t[0].z+t[t.length-1].z)/2;r?(n.z=r.z+a(n._,r._),n.m=n.z-i):n.z=i}else r&&(n.z=r.z+a(n._,r._));n.parent.A=u(n,r,n.parent.A||e[0])}function r(n){n._.x=n.z+n.parent.m,n.m+=n.parent.m}function u(n,t,e){if(t){for(var r,u=n,i=n,o=t,l=u.parent.children[0],c=u.m,f=i.m,s=o.m,h=l.m;o=hr(o),u=sr(u),o&&u;)l=sr(l),i=hr(i),i.a=n,r=o.z+s-u.z-c+a(o._,u._),r>0&&(gr(dr(o,n,e),n,r),c+=r,f+=r),s+=o.m,c+=u.m,h+=l.m,f+=i.m;o&&!hr(i)&&(i.t=o,i.m+=s-f),u&&!sr(l)&&(l.t=u,l.m+=c-h,e=n)}return e}function i(n){n.x*=l[0],n.y=n.depth*l[1]}var o=Iu.layout.hierarchy().sort(null).value(null),a=fr,l=[1,1],c=null;return n.separation=function(t){return arguments.length?(a=t,n):a},n.size=function(t){return arguments.length?(c=null==(l=t)?i:null,n):c?null:l},n.nodeSize=function(t){return arguments.length?(c=null==(l=t)?null:i,n):c?l:null},Pe(n,o)},Iu.layout.cluster=function(){function n(n,i){var o,a=t.call(this,n,i),l=a[0],c=0;He(l,function(n){var t=n.children;t&&t.length?(n.x=yr(t),n.y=vr(t)):(n.x=o?c+=e(n,o):0,n.y=0,o=n)});var f=mr(l),s=xr(l),h=f.x-e(f,s)/2,g=s.x+e(s,f)/2;return He(l,u?function(n){n.x=(n.x-l.x)*r[0],n.y=(l.y-n.y)*r[1]}:function(n){n.x=(n.x-h)/(g-h)*r[0],n.y=(1-(l.y?n.y/l.y:1))*r[1]}),a}var t=Iu.layout.hierarchy().sort(null).value(null),e=fr,r=[1,1],u=!1;return n.separation=function(t){return arguments.length?(e=t,n):e},n.size=function(t){return arguments.length?(u=null==(r=t),n):u?null:r},n.nodeSize=function(t){return arguments.length?(u=null!=(r=t),n):u?r:null},Pe(n,t)},Iu.layout.treemap=function(){function n(n,t){for(var e,r,u=-1,i=n.length;++u<i;)r=(e=n[u]).value*(0>t?0:t),e.area=isNaN(r)||0>=r?0:r}function t(e){var i=e.children;if(i&&i.length){var o,a,l,c=s(e),f=[],h=i.slice(),p=1/0,d="slice"===g?c.dx:"dice"===g?c.dy:"slice-dice"===g?1&e.depth?c.dy:c.dx:Math.min(c.dx,c.dy);for(n(h,c.dx*c.dy/e.value),f.area=0;(l=h.length)>0;)f.push(o=h[l-1]),f.area+=o.area,"squarify"!==g||(a=r(f,d))<=p?(h.pop(),p=a):(f.area-=f.pop().area,u(f,d,c,!1),d=Math.min(c.dx,c.dy),f.length=f.area=0,p=1/0);f.length&&(u(f,d,c,!0),f.length=f.area=0),i.forEach(t)}}function e(t){var r=t.children;if(r&&r.length){var i,o=s(t),a=r.slice(),l=[];for(n(a,o.dx*o.dy/t.value),l.area=0;i=a.pop();)l.push(i),l.area+=i.area,null!=i.z&&(u(l,i.z?o.dx:o.dy,o,!a.length),l.length=l.area=0);r.forEach(e)}}function r(n,t){for(var e,r=n.area,u=0,i=1/0,o=-1,a=n.length;++o<a;)(e=n[o].area)&&(i>e&&(i=e),e>u&&(u=e));return r*=r,t*=t,r?Math.max(t*u*p/r,r/(t*i*p)):1/0}function u(n,t,e,r){var u,i=-1,o=n.length,a=e.x,c=e.y,f=t?l(n.area/t):0;if(t==e.dx){for((r||f>e.dy)&&(f=e.dy);++i<o;)u=n[i],u.x=a,u.y=c,u.dy=f,a+=u.dx=Math.min(e.x+e.dx-a,f?l(u.area/f):0);u.z=!0,u.dx+=e.x+e.dx-a,e.y+=f,e.dy-=f}else{for((r||f>e.dx)&&(f=e.dx);++i<o;)u=n[i],u.x=a,u.y=c,u.dx=f,c+=u.dy=Math.min(e.y+e.dy-c,f?l(u.area/f):0);u.z=!1,u.dy+=e.y+e.dy-c,e.x+=f,e.dx-=f}}function i(r){var u=o||a(r),i=u[0];return i.x=i.y=0,i.value?(i.dx=c[0],i.dy=c[1]):i.dx=i.dy=0,o&&a.revalue(i),n([i],i.dx*i.dy/i.value),(o?e:t)(i),h&&(o=u),u}var o,a=Iu.layout.hierarchy(),l=Math.round,c=[1,1],f=null,s=Mr,h=!1,g="squarify",p=.5*(1+Math.sqrt(5));return i.size=function(n){return arguments.length?(c=n,i):c},i.padding=function(n){function t(t){var e=n.call(i,t,t.depth);return null==e?Mr(t):_r(t,"number"==typeof e?[e,e,e,e]:e)}function e(t){return _r(t,n)}if(!arguments.length)return f;var r;return s=null==(f=n)?Mr:"function"==(r=typeof n)?t:"number"===r?(n=[n,n,n,n],e):e,i},i.round=function(n){return arguments.length?(l=n?Math.round:Number,i):l!=Number},i.sticky=function(n){return arguments.length?(h=n,o=null,i):h},i.ratio=function(n){return arguments.length?(p=n,i):p},i.mode=function(n){return arguments.length?(g=n+"",i):g},Pe(i,a)},Iu.random={normal:function(n,t){var e=arguments.length;return 2>e&&(t=1),1>e&&(n=0),function(){var e,r,u;do e=2*Math.random()-1,r=2*Math.random()-1,u=e*e+r*r;while(!u||u>1);return n+t*e*Math.sqrt(-2*Math.log(u)/u)}},logNormal:function(){var n=Iu.random.normal.apply(Iu,arguments);return function(){return Math.exp(n())}},bates:function(n){var t=Iu.random.irwinHall(n);return function(){return t()/n}},irwinHall:function(n){return function(){for(var t=0,e=0;n>e;e++)t+=Math.random();return t}}},Iu.scale={};var ko={floor:m,ceil:m};Iu.scale.linear=function(){return zr([0,1],[0,1],Kt,!1)};var No={s:1,g:1,p:1,r:1,e:1};Iu.scale.log=function(){return Ur(Iu.scale.linear().domain([0,1]),10,!0,[1,10])};var Ao=Iu.format(".0e"),Co={floor:function(n){return-Math.ceil(-n)},ceil:function(n){return-Math.floor(-n)}};Iu.scale.pow=function(){return Pr(Iu.scale.linear(),1,[0,1])},Iu.scale.sqrt=function(){return Iu.scale.pow().exponent(.5)},Iu.scale.ordinal=function(){return Hr([],{t:"range",a:[[]]})},Iu.scale.category10=function(){return Iu.scale.ordinal().range(zo)},Iu.scale.category20=function(){return Iu.scale.ordinal().range(Lo)},Iu.scale.category20b=function(){return Iu.scale.ordinal().range(So)},Iu.scale.category20c=function(){return Iu.scale.ordinal().range(To)};var zo=[2062260,16744206,2924588,14034728,9725885,9197131,14907330,8355711,12369186,1556175].map(yn),Lo=[2062260,11454440,16744206,16759672,2924588,10018698,14034728,16750742,9725885,12955861,9197131,12885140,14907330,16234194,8355711,13092807,12369186,14408589,1556175,10410725].map(yn),So=[3750777,5395619,7040719,10264286,6519097,9216594,11915115,13556636,9202993,12426809,15186514,15190932,8666169,11356490,14049643,15177372,8077683,10834324,13528509,14589654].map(yn),To=[3244733,7057110,10406625,13032431,15095053,16616764,16625259,16634018,3253076,7652470,10607003,13101504,7695281,10394312,12369372,14342891,6513507,9868950,12434877,14277081].map(yn);Iu.scale.quantile=function(){return Fr([],[])},Iu.scale.quantize=function(){return Or(0,1,[0,1])},Iu.scale.threshold=function(){return Yr([.5],[0,1])},Iu.scale.identity=function(){return Ir([0,1])},Iu.svg={},Iu.svg.arc=function(){function n(){var n=Math.max(0,+e.apply(this,arguments)),c=Math.max(0,+r.apply(this,arguments)),f=o.apply(this,arguments)-wi,s=a.apply(this,arguments)-wi,h=Math.abs(s-f),g=f>s?0:1;if(n>c&&(p=c,c=n,n=p),h>=bi)return t(c,g)+(n?t(n,1-g):"")+"Z";var p,d,v,y,m,x,M,_,b,w,k,N,A=0,C=0,z=[];if((y=(+l.apply(this,arguments)||0)/2)&&(v=i===qo?Math.sqrt(n*n+c*c):+i.apply(this,arguments),g||(C*=-1),c&&(C=Q(v/c*Math.sin(y))),n&&(A=Q(v/n*Math.sin(y)))),c){m=c*Math.cos(f+C),x=c*Math.sin(f+C),M=c*Math.cos(s-C),_=c*Math.sin(s-C);var L=Math.abs(s-f-2*C)<=Mi?0:1;if(C&&Jr(m,x,M,_)===g^L){var S=(f+s)/2;m=c*Math.cos(S),x=c*Math.sin(S),M=_=null}}else m=x=0;if(n){b=n*Math.cos(s-A),w=n*Math.sin(s-A),k=n*Math.cos(f+A),N=n*Math.sin(f+A);var T=Math.abs(f-s+2*A)<=Mi?0:1;if(A&&Jr(b,w,k,N)===1-g^T){var q=(f+s)/2;b=n*Math.cos(q),w=n*Math.sin(q),k=N=null}}else b=w=0;if(h>mi&&(p=Math.min(Math.abs(c-n)/2,+u.apply(this,arguments)))>.001){d=c>n^g?0:1;var D=p,R=p;if(Mi>h){var E=null==k?[b,w]:null==M?[m,x]:ht([m,x],[k,N],[M,_],[b,w]),U=m-E[0],P=x-E[1],j=M-E[0],H=_-E[1],F=1/Math.sin(Math.acos((U*j+P*H)/(Math.sqrt(U*U+P*P)*Math.sqrt(j*j+H*H)))/2),O=Math.sqrt(E[0]*E[0]+E[1]*E[1]);R=Math.min(p,(n-O)/(F-1)),D=Math.min(p,(c-O)/(F+1))}if(null!=M){var Y=Gr(null==k?[b,w]:[k,N],[m,x],c,D,g),I=Gr([M,_],[b,w],c,D,g);p===D?z.push("M",Y[0],"A",D,",",D," 0 0,",d," ",Y[1],"A",c,",",c," 0 ",1-g^Jr(Y[1][0],Y[1][1],I[1][0],I[1][1]),",",g," ",I[1],"A",D,",",D," 0 0,",d," ",I[0]):z.push("M",Y[0],"A",D,",",D," 0 1,",d," ",I[0])}else z.push("M",m,",",x);if(null!=k){var Z=Gr([m,x],[k,N],n,-R,g),V=Gr([b,w],null==M?[m,x]:[M,_],n,-R,g);p===R?z.push("L",V[0],"A",R,",",R," 0 0,",d," ",V[1],"A",n,",",n," 0 ",g^Jr(V[1][0],V[1][1],Z[1][0],Z[1][1]),",",1-g," ",Z[1],"A",R,",",R," 0 0,",d," ",Z[0]):z.push("L",V[0],"A",R,",",R," 0 0,",d," ",Z[0])}else z.push("L",b,",",w)}else z.push("M",m,",",x),null!=M&&z.push("A",c,",",c," 0 ",L,",",g," ",M,",",_),z.push("L",b,",",w),null!=k&&z.push("A",n,",",n," 0 ",T,",",1-g," ",k,",",N);return z.push("Z"),z.join("")}function t(n,t){return"M0,"+n+"A"+n+","+n+" 0 1,"+t+" 0,"+-n+"A"+n+","+n+" 0 1,"+t+" 0,"+n}var e=Vr,r=Xr,u=Zr,i=qo,o=$r,a=Br,l=Wr;return n.innerRadius=function(t){return arguments.length?(e=kn(t),n):e},n.outerRadius=function(t){return arguments.length?(r=kn(t),n):r},n.cornerRadius=function(t){return arguments.length?(u=kn(t),n):u},n.padRadius=function(t){return arguments.length?(i=t==qo?qo:kn(t),n):i},n.startAngle=function(t){return arguments.length?(o=kn(t),n):o},n.endAngle=function(t){return arguments.length?(a=kn(t),n):a},n.padAngle=function(t){return arguments.length?(l=kn(t),n):l},n.centroid=function(){var n=(+e.apply(this,arguments)+ +r.apply(this,arguments))/2,t=(+o.apply(this,arguments)+ +a.apply(this,arguments))/2-wi;return[Math.cos(t)*n,Math.sin(t)*n]},n};var qo="auto";Iu.svg.line=function(){return Qr(m)};var Do=Iu.map({linear:nu,"linear-closed":tu,step:eu,"step-before":ru,"step-after":uu,basis:fu,"basis-open":su,"basis-closed":hu,bundle:gu,cardinal:au,"cardinal-open":iu,"cardinal-closed":ou,monotone:xu});Do.forEach(function(n,t){t.key=n,t.closed=/-closed$/.test(n)});var Ro=[0,2/3,1/3,0],Eo=[0,1/3,2/3,0],Uo=[0,1/6,2/3,1/6];Iu.svg.line.radial=function(){var n=Qr(Mu);return n.radius=n.x,delete n.x,n.angle=n.y,delete n.y,n},ru.reverse=uu,uu.reverse=ru,Iu.svg.area=function(){return _u(m)},Iu.svg.area.radial=function(){var n=_u(Mu);return n.radius=n.x,delete n.x,n.innerRadius=n.x0,delete n.x0,n.outerRadius=n.x1,delete n.x1,n.angle=n.y,delete n.y,n.startAngle=n.y0,delete n.y0,n.endAngle=n.y1,delete n.y1,n},Iu.svg.chord=function(){function n(n,a){var l=t(this,i,n,a),c=t(this,o,n,a);return"M"+l.p0+r(l.r,l.p1,l.a1-l.a0)+(e(l,c)?u(l.r,l.p1,l.r,l.p0):u(l.r,l.p1,c.r,c.p0)+r(c.r,c.p1,c.a1-c.a0)+u(c.r,c.p1,l.r,l.p0))+"Z"}function t(n,t,e,r){var u=t.call(n,e,r),i=a.call(n,u,r),o=l.call(n,u,r)-wi,f=c.call(n,u,r)-wi;return{r:i,a0:o,a1:f,p0:[i*Math.cos(o),i*Math.sin(o)],p1:[i*Math.cos(f),i*Math.sin(f)]}}function e(n,t){return n.a0==t.a0&&n.a1==t.a1}function r(n,t,e){return"A"+n+","+n+" 0 "+ +(e>Mi)+",1 "+t}function u(n,t,e,r){return"Q 0,0 "+r}var i=bu,o=wu,a=ku,l=$r,c=Br;return n.radius=function(t){return arguments.length?(a=kn(t),n):a},n.source=function(t){return arguments.length?(i=kn(t),n):i},n.target=function(t){return arguments.length?(o=kn(t),n):o},n.startAngle=function(t){return arguments.length?(l=kn(t),n):l},n.endAngle=function(t){return arguments.length?(c=kn(t),n):c},n},Iu.svg.diagonal=function(){function n(n,u){var i=t.call(this,n,u),o=e.call(this,n,u),a=(i.y+o.y)/2,l=[i,{x:i.x,y:a},{x:o.x,y:a},o];return l=l.map(r),"M"+l[0]+"C"+l[1]+" "+l[2]+" "+l[3]}var t=bu,e=wu,r=Nu;return n.source=function(e){return arguments.length?(t=kn(e),n):t},n.target=function(t){return arguments.length?(e=kn(t),n):e},n.projection=function(t){return arguments.length?(r=t,n):r},n},Iu.svg.diagonal.radial=function(){var n=Iu.svg.diagonal(),t=Nu,e=n.projection;return n.projection=function(n){return arguments.length?e(Au(t=n)):t},n},Iu.svg.symbol=function(){function n(n,r){return(Po.get(t.call(this,n,r))||Lu)(e.call(this,n,r))}var t=zu,e=Cu;return n.type=function(e){return arguments.length?(t=kn(e),n):t},n.size=function(t){return arguments.length?(e=kn(t),n):e},n};var Po=Iu.map({circle:Lu,cross:function(n){var t=Math.sqrt(n/5)/2;return"M"+-3*t+","+-t+"H"+-t+"V"+-3*t+"H"+t+"V"+-t+"H"+3*t+"V"+t+"H"+t+"V"+3*t+"H"+-t+"V"+t+"H"+-3*t+"Z"},diamond:function(n){var t=Math.sqrt(n/(2*Ho)),e=t*Ho;return"M0,"+-t+"L"+e+",0 0,"+t+" "+-e+",0Z"},square:function(n){var t=Math.sqrt(n)/2;return"M"+-t+","+-t+"L"+t+","+-t+" "+t+","+t+" "+-t+","+t+"Z"},"triangle-down":function(n){var t=Math.sqrt(n/jo),e=t*jo/2;return"M0,"+e+"L"+t+","+-e+" "+-t+","+-e+"Z"},"triangle-up":function(n){var t=Math.sqrt(n/jo),e=t*jo/2;return"M0,"+-e+"L"+t+","+e+" "+-t+","+e+"Z"}});Iu.svg.symbolTypes=Po.keys();var jo=Math.sqrt(3),Ho=Math.tan(30*ki);fi.transition=function(n){for(var t,e,r=Fo||++Zo,u=Ru(n),i=[],o=Oo||{time:Date.now(),ease:ie,delay:0,duration:250},a=-1,l=this.length;++a<l;){i.push(t=[]);for(var c=this[a],f=-1,s=c.length;++f<s;)(e=c[f])&&Eu(e,f,u,r,o),t.push(e)}return Tu(i,u,r)},fi.interrupt=function(n){return this.each(null==n?Yo:Su(Ru(n)))};var Fo,Oo,Yo=Su(Ru()),Io=[],Zo=0;Io.call=fi.call,Io.empty=fi.empty,Io.node=fi.node,Io.size=fi.size,Iu.transition=function(n,t){return n&&n.transition?Fo?n.transition(t):n:Iu.selection().transition(n)},Iu.transition.prototype=Io,Io.select=function(n){var t,e,r,u=this.id,i=this.namespace,o=[];n=z(n);for(var a=-1,l=this.length;++a<l;){o.push(t=[]);for(var c=this[a],f=-1,s=c.length;++f<s;)(r=c[f])&&(e=n.call(r,r.__data__,f,a))?("__data__"in r&&(e.__data__=r.__data__),Eu(e,f,i,u,r[i][u]),t.push(e)):t.push(null)}return Tu(o,i,u)},Io.selectAll=function(n){var t,e,r,u,i,o=this.id,a=this.namespace,l=[];n=L(n);for(var c=-1,f=this.length;++c<f;)for(var s=this[c],h=-1,g=s.length;++h<g;)if(r=s[h]){i=r[a][o],e=n.call(r,r.__data__,h,c),l.push(t=[]);for(var p=-1,d=e.length;++p<d;)(u=e[p])&&Eu(u,p,a,o,i),t.push(u)}return Tu(l,a,o)},Io.filter=function(n){var t,e,r,u=[];"function"!=typeof n&&(n=O(n));for(var i=0,o=this.length;o>i;i++){u.push(t=[]);for(var e=this[i],a=0,l=e.length;l>a;a++)(r=e[a])&&n.call(r,r.__data__,a,i)&&t.push(r)}return Tu(u,this.namespace,this.id)},Io.tween=function(n,t){var e=this.id,r=this.namespace;return arguments.length<2?this.node()[r][e].tween.get(n):I(this,null==t?function(t){t[r][e].tween.remove(n)}:function(u){u[r][e].tween.set(n,t)})},Io.attr=function(n,t){function e(){this.removeAttribute(a)}function r(){this.removeAttributeNS(a.space,a.local)}function u(n){return null==n?e:(n+="",function(){var t,e=this.getAttribute(a);return e!==n&&(t=o(e,n),function(n){this.setAttribute(a,t(n))})})}function i(n){return null==n?r:(n+="",function(){var t,e=this.getAttributeNS(a.space,a.local);return e!==n&&(t=o(e,n),function(n){this.setAttributeNS(a.space,a.local,t(n))})})}if(arguments.length<2){for(t in n)this.attr(t,n[t]);return this}var o="transform"==n?Ae:Kt,a=Iu.ns.qualify(n);return qu(this,"attr."+n,t,a.local?i:u)},Io.attrTween=function(n,t){function e(n,e){var r=t.call(this,n,e,this.getAttribute(u));return r&&function(n){this.setAttribute(u,r(n))}}function r(n,e){var r=t.call(this,n,e,this.getAttributeNS(u.space,u.local));return r&&function(n){this.setAttributeNS(u.space,u.local,r(n))}}var u=Iu.ns.qualify(n);return this.tween("attr."+n,u.local?r:e)},Io.style=function(n,e,r){function u(){this.style.removeProperty(n)}function i(e){return null==e?u:(e+="",function(){var u,i=t(this).getComputedStyle(this,null).getPropertyValue(n);return i!==e&&(u=Kt(i,e),function(t){this.style.setProperty(n,u(t),r)})})}var o=arguments.length;if(3>o){if("string"!=typeof n){2>o&&(e="");for(r in n)this.style(r,n[r],e);return this}r=""}return qu(this,"style."+n,e,i)},Io.styleTween=function(n,e,r){function u(u,i){var o=e.call(this,u,i,t(this).getComputedStyle(this,null).getPropertyValue(n));return o&&function(t){this.style.setProperty(n,o(t),r)}}return arguments.length<3&&(r=""),this.tween("style."+n,u)},Io.text=function(n){return qu(this,"text",n,Du)},Io.remove=function(){var n=this.namespace;return this.each("end.transition",function(){var t;this[n].count<2&&(t=this.parentNode)&&t.removeChild(this)})},Io.ease=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].ease:("function"!=typeof n&&(n=Iu.ease.apply(Iu,arguments)),I(this,function(r){r[e][t].ease=n}))},Io.delay=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].delay:I(this,"function"==typeof n?function(r,u,i){r[e][t].delay=+n.call(r,r.__data__,u,i)}:(n=+n,function(r){r[e][t].delay=n}))},Io.duration=function(n){var t=this.id,e=this.namespace;return arguments.length<1?this.node()[e][t].duration:I(this,"function"==typeof n?function(r,u,i){r[e][t].duration=Math.max(1,n.call(r,r.__data__,u,i))}:(n=Math.max(1,n),function(r){r[e][t].duration=n}))},Io.each=function(n,t){var e=this.id,r=this.namespace;if(arguments.length<2){var u=Oo,i=Fo;try{Fo=e,I(this,function(t,u,i){Oo=t[r][e],n.call(t,t.__data__,u,i)})}finally{Oo=u,Fo=i}}else I(this,function(u){var i=u[r][e];(i.event||(i.event=Iu.dispatch("start","end","interrupt"))).on(n,t)});return this},Io.transition=function(){for(var n,t,e,r,u=this.id,i=++Zo,o=this.namespace,a=[],l=0,c=this.length;c>l;l++){a.push(n=[]);for(var t=this[l],f=0,s=t.length;s>f;f++)(e=t[f])&&(r=e[o][u],Eu(e,f,o,i,{time:r.time,ease:r.ease,delay:r.delay+r.duration,duration:r.duration})),n.push(e)}return Tu(a,o,i)},Iu.svg.axis=function(){function n(n){n.each(function(){var n,c=Iu.select(this),f=this.__chart__||e,s=this.__chart__=e.copy(),h=null==l?s.ticks?s.ticks.apply(s,a):s.domain():l,g=null==t?s.tickFormat?s.tickFormat.apply(s,a):m:t,p=c.selectAll(".tick").data(h,s),d=p.enter().insert("g",".domain").attr("class","tick").style("opacity",mi),v=Iu.transition(p.exit()).style("opacity",mi).remove(),y=Iu.transition(p.order()).style("opacity",1),x=Math.max(u,0)+o,M=wr(s),_=c.selectAll(".domain").data([0]),b=(_.enter().append("path").attr("class","domain"),Iu.transition(_));d.append("line"),d.append("text");var w,k,N,A,C=d.select("line"),z=y.select("line"),L=p.select("text").text(g),S=d.select("text"),T=y.select("text"),q="top"===r||"left"===r?-1:1;if("bottom"===r||"top"===r?(n=Uu,w="x",N="y",k="x2",A="y2",L.attr("dy",0>q?"0em":".71em").style("text-anchor","middle"),b.attr("d","M"+M[0]+","+q*i+"V0H"+M[1]+"V"+q*i)):(n=Pu,w="y",N="x",k="y2",A="x2",L.attr("dy",".32em").style("text-anchor",0>q?"end":"start"),b.attr("d","M"+q*i+","+M[0]+"H0V"+M[1]+"H"+q*i)),C.attr(A,q*u),S.attr(N,q*x),z.attr(k,0).attr(A,q*u),T.attr(w,0).attr(N,q*x),s.rangeBand){var D=s,R=D.rangeBand()/2;f=s=function(n){return D(n)+R}}else f.rangeBand?f=s:v.call(n,s,f);d.call(n,f,s),y.call(n,s,s)})}var t,e=Iu.scale.linear(),r=Vo,u=6,i=6,o=3,a=[10],l=null;return n.scale=function(t){return arguments.length?(e=t,n):e},n.orient=function(t){return arguments.length?(r=t in Xo?t+"":Vo,n):r},n.ticks=function(){return arguments.length?(a=Vu(arguments),n):a},n.tickValues=function(t){return arguments.length?(l=t,n):l},n.tickFormat=function(e){return arguments.length?(t=e,n):t},n.tickSize=function(t){var e=arguments.length;return e?(u=+t,i=+arguments[e-1],n):u},n.innerTickSize=function(t){return arguments.length?(u=+t,n):u},n.outerTickSize=function(t){return arguments.length?(i=+t,n):i},n.tickPadding=function(t){return arguments.length?(o=+t,n):o},n.tickSubdivide=function(){return arguments.length&&n},n};var Vo="bottom",Xo={top:1,right:1,bottom:1,left:1};Iu.svg.brush=function(){function n(t){t.each(function(){var t=Iu.select(this).style("pointer-events","all").style("-webkit-tap-highlight-color","rgba(0,0,0,0)").on("mousedown.brush",i).on("touchstart.brush",i),o=t.selectAll(".background").data([0]);o.enter().append("rect").attr("class","background").style("visibility","hidden").style("cursor","crosshair"),t.selectAll(".extent").data([0]).enter().append("rect").attr("class","extent").style("cursor","move");var a=t.selectAll(".resize").data(d,m);a.exit().remove(),a.enter().append("g").attr("class",function(n){return"resize "+n}).style("cursor",function(n){return $o[n]}).append("rect").attr("x",function(n){return/[ew]$/.test(n)?-3:null}).attr("y",function(n){return/^[ns]/.test(n)?-3:null}).attr("width",6).attr("height",6).style("visibility","hidden"),a.style("display",n.empty()?"none":null);var l,s=Iu.transition(t),h=Iu.transition(o);c&&(l=wr(c),h.attr("x",l[0]).attr("width",l[1]-l[0]),r(s)),f&&(l=wr(f),h.attr("y",l[0]).attr("height",l[1]-l[0]),u(s)),e(s)})}function e(n){n.selectAll(".resize").attr("transform",function(n){return"translate("+s[+/e$/.test(n)]+","+h[+/^s/.test(n)]+")"})}function r(n){n.select(".extent").attr("x",s[0]),n.selectAll(".extent,.n>rect,.s>rect").attr("width",s[1]-s[0])}function u(n){n.select(".extent").attr("y",h[0]),n.selectAll(".extent,.e>rect,.w>rect").attr("height",h[1]-h[0])}function i(){function i(){32==Iu.event.keyCode&&(L||(x=null,T[0]-=s[1],T[1]-=h[1],L=2),k())}function d(){32==Iu.event.keyCode&&2==L&&(T[0]+=s[1],T[1]+=h[1],L=0,k())}function v(){var n=Iu.mouse(_),t=!1;M&&(n[0]+=M[0],n[1]+=M[1]),L||(Iu.event.altKey?(x||(x=[(s[0]+s[1])/2,(h[0]+h[1])/2]),T[0]=s[+(n[0]<x[0])],T[1]=h[+(n[1]<x[1])]):x=null),C&&y(n,c,0)&&(r(N),t=!0),z&&y(n,f,1)&&(u(N),t=!0),t&&(e(N),w({type:"brush",mode:L?"move":"resize"}))}function y(n,t,e){var r,u,i=wr(t),l=i[0],c=i[1],f=T[e],d=e?h:s,v=d[1]-d[0];return L&&(l-=f,c-=v+f),r=(e?p:g)?Math.max(l,Math.min(c,n[e])):n[e],L?u=(r+=f)+v:(x&&(f=Math.max(l,Math.min(c,2*x[e]-r))),r>f?(u=r,r=f):u=f),d[0]!=r||d[1]!=u?(e?a=null:o=null,d[0]=r,d[1]=u,!0):void 0}function m(){v(),N.style("pointer-events","all").selectAll(".resize").style("display",n.empty()?"none":null),Iu.select("body").style("cursor",null),q.on("mousemove.brush",null).on("mouseup.brush",null).on("touchmove.brush",null).on("touchend.brush",null).on("keydown.brush",null).on("keyup.brush",null),S(),w({type:"brushend"})}var x,M,_=this,b=Iu.select(Iu.event.target),w=l.of(_,arguments),N=Iu.select(_),A=b.datum(),C=!/^(n|s)$/.test(A)&&c,z=!/^(e|w)$/.test(A)&&f,L=b.classed("extent"),S=W(_),T=Iu.mouse(_),q=Iu.select(t(_)).on("keydown.brush",i).on("keyup.brush",d);if(Iu.event.changedTouches?q.on("touchmove.brush",v).on("touchend.brush",m):q.on("mousemove.brush",v).on("mouseup.brush",m),N.interrupt().selectAll("*").interrupt(),L)T[0]=s[0]-T[0],T[1]=h[0]-T[1];else if(A){var D=+/w$/.test(A),R=+/^n/.test(A);M=[s[1-D]-T[0],h[1-R]-T[1]],T[0]=s[D],T[1]=h[R]}else Iu.event.altKey&&(x=T.slice());N.style("pointer-events","none").selectAll(".resize").style("display",null),Iu.select("body").style("cursor",b.style("cursor")),w({type:"brushstart"}),v()}var o,a,l=A(n,"brushstart","brush","brushend"),c=null,f=null,s=[0,0],h=[0,0],g=!0,p=!0,d=Bo[0];return n.event=function(n){n.each(function(){var n=l.of(this,arguments),t={x:s,y:h,i:o,j:a},e=this.__chart__||t;this.__chart__=t,Fo?Iu.select(this).transition().each("start.brush",function(){o=e.i,a=e.j,s=e.x,h=e.y,n({type:"brushstart"})}).tween("brush:brush",function(){var e=Qt(s,t.x),r=Qt(h,t.y);return o=a=null,function(u){s=t.x=e(u),h=t.y=r(u),n({type:"brush",mode:"resize"})}}).each("end.brush",function(){o=t.i,a=t.j,n({type:"brush",mode:"resize"}),n({type:"brushend"})}):(n({type:"brushstart"}),n({type:"brush",mode:"resize"}),n({type:"brushend"}))})},n.x=function(t){return arguments.length?(c=t,d=Bo[!c<<1|!f],n):c},n.y=function(t){return arguments.length?(f=t,d=Bo[!c<<1|!f],n):f},n.clamp=function(t){return arguments.length?(c&&f?(g=!!t[0],p=!!t[1]):c?g=!!t:f&&(p=!!t),n):c&&f?[g,p]:c?g:f?p:null},n.extent=function(t){var e,r,u,i,l;return arguments.length?(c&&(e=t[0],r=t[1],f&&(e=e[0],r=r[0]),o=[e,r],c.invert&&(e=c(e),r=c(r)),e>r&&(l=e,e=r,r=l),e==s[0]&&r==s[1]||(s=[e,r])),f&&(u=t[0],i=t[1],c&&(u=u[1],i=i[1]),a=[u,i],f.invert&&(u=f(u),i=f(i)),u>i&&(l=u,u=i,i=l),u==h[0]&&i==h[1]||(h=[u,i])),n):(c&&(o?(e=o[0],r=o[1]):(e=s[0],r=s[1],c.invert&&(e=c.invert(e),r=c.invert(r)),e>r&&(l=e,e=r,r=l))),f&&(a?(u=a[0],i=a[1]):(u=h[0],i=h[1],f.invert&&(u=f.invert(u),i=f.invert(i)),u>i&&(l=u,u=i,i=l))),c&&f?[[e,u],[r,i]]:c?[e,r]:f&&[u,i])},n.clear=function(){return n.empty()||(s=[0,0],h=[0,0],o=a=null),n},n.empty=function(){return!!c&&s[0]==s[1]||!!f&&h[0]==h[1]},Iu.rebind(n,l,"on")};var $o={n:"ns-resize",e:"ew-resize",s:"ns-resize",w:"ew-resize",nw:"nwse-resize",ne:"nesw-resize",se:"nwse-resize",sw:"nesw-resize"},Bo=[["n","e","s","w","nw","ne","se","sw"],["e","w"],["n","s"],[]],Wo=Wi.format=to.timeFormat,Jo=Wo.utc,Go=Jo("%Y-%m-%dT%H:%M:%S.%LZ");Wo.iso=Date.prototype.toISOString&&+new Date("2000-01-01T00:00:00.000Z")?ju:Go,ju.parse=function(n){var t=new Date(n);return isNaN(t)?null:t},ju.toString=Go.toString,Wi.second=jn(function(n){return new Ji(1e3*Math.floor(n/1e3))},function(n,t){n.setTime(n.getTime()+1e3*Math.floor(t))},function(n){return n.getSeconds()}),Wi.seconds=Wi.second.range,Wi.seconds.utc=Wi.second.utc.range,Wi.minute=jn(function(n){return new Ji(6e4*Math.floor(n/6e4))},function(n,t){n.setTime(n.getTime()+6e4*Math.floor(t))},function(n){return n.getMinutes()}),Wi.minutes=Wi.minute.range,Wi.minutes.utc=Wi.minute.utc.range,Wi.hour=jn(function(n){var t=n.getTimezoneOffset()/60;return new Ji(36e5*(Math.floor(n/36e5-t)+t))},function(n,t){n.setTime(n.getTime()+36e5*Math.floor(t))},function(n){return n.getHours()}),Wi.hours=Wi.hour.range,Wi.hours.utc=Wi.hour.utc.range,Wi.month=jn(function(n){return n=Wi.day(n),n.setDate(1),n},function(n,t){n.setMonth(n.getMonth()+t)},function(n){return n.getMonth()}),Wi.months=Wi.month.range,Wi.months.utc=Wi.month.utc.range;var Ko=[1e3,5e3,15e3,3e4,6e4,3e5,9e5,18e5,36e5,108e5,216e5,432e5,864e5,1728e5,6048e5,2592e6,7776e6,31536e6],Qo=[[Wi.second,1],[Wi.second,5],[Wi.second,15],[Wi.second,30],[Wi.minute,1],[Wi.minute,5],[Wi.minute,15],[Wi.minute,30],[Wi.hour,1],[Wi.hour,3],[Wi.hour,6],[Wi.hour,12],[Wi.day,1],[Wi.day,2],[Wi.week,1],[Wi.month,1],[Wi.month,3],[Wi.year,1]],na=Wo.multi([[".%L",function(n){return n.getMilliseconds()}],[":%S",function(n){return n.getSeconds()}],["%I:%M",function(n){return n.getMinutes()}],["%I %p",function(n){return n.getHours()}],["%a %d",function(n){return n.getDay()&&1!=n.getDate()}],["%b %d",function(n){return 1!=n.getDate()}],["%B",function(n){return n.getMonth()}],["%Y",Kr]]),ta={range:function(n,t,e){return Iu.range(Math.ceil(n/e)*e,+t,e).map(Fu)},floor:m,ceil:m};Qo.year=Wi.year,Wi.scale=function(){return Hu(Iu.scale.linear(),Qo,na)};var ea=Qo.map(function(n){return[n[0].utc,n[1]]}),ra=Jo.multi([[".%L",function(n){return n.getUTCMilliseconds()}],[":%S",function(n){return n.getUTCSeconds()}],["%I:%M",function(n){return n.getUTCMinutes()}],["%I %p",function(n){return n.getUTCHours()}],["%a %d",function(n){return n.getUTCDay()&&1!=n.getUTCDate()}],["%b %d",function(n){return 1!=n.getUTCDate()}],["%B",function(n){return n.getUTCMonth()}],["%Y",Kr]]);ea.year=Wi.year.utc,Wi.scale.utc=function(){return Hu(Iu.scale.linear(),ea,ra)},Iu.text=Nn(function(n){return n.responseText}),Iu.json=function(n,t){return An(n,"application/json",Ou,t)},Iu.html=function(n,t){return An(n,"text/html",Yu,t)},Iu.xml=Nn(function(n){return n.responseXML}),"function"==typeof define&&define.amd?(this.d3=Iu,define(Iu)):"object"==typeof module&&module.exports?module.exports=Iu:this.d3=Iu}.apply(self);
\ No newline at end of file
diff --git a/package.json b/package.json
index 3e6c224799f9b..449c054d157cc 100644
--- a/package.json
+++ b/package.json
@@ -59,8 +59,9 @@
   },
   "scripts": {
     "test": "vows && echo",
-    "prepublish": "npm test && rm -f package.js src/start.js d3.js d3.min.js d3.zip && bin/start > src/start.js && bin/meteor > package.js && smash src/d3.js | uglifyjs - -b indent-level=2 -o d3.js && bin/uglify d3.js > d3.min.js && chmod a-w d3.js d3.min.js package.js && zip d3.zip LICENSE d3.js d3.min.js",
-    "postpublish": "VERSION=`node -e 'console.log(require(\"./package.json\").version)'`; git push && git push --tags && cp -v README.md LICENSE d3.js d3.min.js ../d3-bower && cd ../d3-bower && git add README.md LICENSE d3.js d3.min.js && git commit -m \"Release $VERSION.\" && git tag -am \"Release $VERSION.\" v${VERSION} && git push && git push --tags && cd - && cp -v d3.js ../d3.github.com/d3.v3.js && cp -v d3.min.js ../d3.github.com/d3.v3.min.js && cd ../d3.github.com && git add d3.v3.js d3.v3.min.js && git commit -m \"d3 ${VERSION}\" && git push"
+    "build": "rm -f package.js src/start.js d3.js d3.zip && bin/start > src/start.js && bin/meteor > package.js && smash src/d3.js | uglifyjs - -b indent-level=2 -o d3.js && chmod a-w d3.js package.js && zip d3.zip LICENSE d3.js",
+    "prepublish": "build && test",
+    "postpublish": "VERSION=`node -e 'console.log(require(\"./package.json\").version)'`; git push && git push --tags && cp -v README.md LICENSE d3.js ../d3-bower && cd ../d3-bower && git add README.md LICENSE d3.js && git commit -m \"Release $VERSION.\" && git tag -am \"Release $VERSION.\" v${VERSION} && git push && git push --tags && cd - && cp -v d3.js ../d3.github.com/d3.v3.js && cd ../d3.github.com && git add d3.v3.js && git commit -m \"d3 ${VERSION}\" && git push"
   },
   "license": "BSD-3-Clause"
 }
diff --git a/src/core/document.js b/src/core/document.js
index 58b846dab938a..f59a21494000d 100644
--- a/src/core/document.js
+++ b/src/core/document.js
@@ -1,4 +1,4 @@
-var d3_document = this.document;
+var d3_document = self.document;
 
 function d3_documentElement(node) {
   return node
diff --git a/src/d3.js b/src/d3.js
index a5442333d4941..f5524beb407c6 100644
--- a/src/d3.js
+++ b/src/d3.js
@@ -15,7 +15,6 @@ import "math/";
 import "scale/";
 import "selection/";
 import "svg/";
-import "time/";
 import "transition/";
 import "xhr/";
 
diff --git a/src/format/format.js b/src/format/format.js
deleted file mode 100644
index bf740dbde10f1..0000000000000
--- a/src/format/format.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import "../locale/en-US";
-
-d3.format = d3_locale_enUS.numberFormat;
diff --git a/src/format/formatPrefix.js b/src/format/formatPrefix.js
deleted file mode 100644
index b5a8bab1e026a..0000000000000
--- a/src/format/formatPrefix.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import "precision";
-import "round";
-import "../math/abs";
-
-var d3_formatPrefixes = ["y","z","a","f","p","n","µ","m","","k","M","G","T","P","E","Z","Y"].map(d3_formatPrefix);
-
-d3.formatPrefix = function(value, precision) {
-  var i = 0;
-  if (value = +value) {
-    if (value < 0) value *= -1;
-    if (precision) value = d3.round(value, d3_format_precision(value, precision));
-    i = 1 + Math.floor(1e-12 + Math.log(value) / Math.LN10);
-    i = Math.max(-24, Math.min(24, Math.floor((i - 1) / 3) * 3));
-  }
-  return d3_formatPrefixes[8 + i / 3];
-};
-
-function d3_formatPrefix(d, i) {
-  var k = Math.pow(10, abs(8 - i) * 3);
-  return {
-    scale: i > 8 ? function(d) { return d / k; } : function(d) { return d * k; },
-    symbol: d
-  };
-}
diff --git a/src/format/index.js b/src/format/index.js
index 21d7e9de2b580..688fa052daf4f 100644
--- a/src/format/index.js
+++ b/src/format/index.js
@@ -1,4 +1,2 @@
-import "format";
-import "formatPrefix";
 import "requote";
 import "round";
diff --git a/src/format/precision.js b/src/format/precision.js
deleted file mode 100644
index 24e32a1e6d006..0000000000000
--- a/src/format/precision.js
+++ /dev/null
@@ -1,3 +0,0 @@
-function d3_format_precision(x, p) {
-  return p - (x ? Math.ceil(Math.log(x) / Math.LN10) : 1);
-}
diff --git a/src/locale/ca-ES.js b/src/locale/ca-ES.js
deleted file mode 100644
index 73be711a2db73..0000000000000
--- a/src/locale/ca-ES.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_caES = d3.locale({
-  decimal: ",",
-  thousands: ".",
-  grouping: [3],
-  currency: ["", " €"],
-  dateTime: "%A, %e de %B de %Y, %X",
-  date: "%d/%m/%Y",
-  time: "%H:%M:%S",
-  periods: ["AM", "PM"],
-  days: ["diumenge", "dilluns", "dimarts", "dimecres", "dijous", "divendres", "dissabte"],
-  shortDays: ["dg.", "dl.", "dt.", "dc.", "dj.", "dv.", "ds."],
-  months: ["gener", "febrer", "març", "abril", "maig", "juny", "juliol", "agost", "setembre", "octubre", "novembre", "desembre"],
-  shortMonths: ["gen.", "febr.", "març", "abr.", "maig", "juny", "jul.", "ag.", "set.", "oct.", "nov.", "des."]
-});
diff --git a/src/locale/de-CH.js b/src/locale/de-CH.js
deleted file mode 100644
index 8d760ceb13518..0000000000000
--- a/src/locale/de-CH.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_deCH = d3.locale({
-  decimal: ",",
-  thousands: "'",
-  grouping: [3],
-  currency: ["", " CHF"],
-  dateTime: "%A, der %e. %B %Y, %X",
-  date: "%d.%m.%Y",
-  time: "%H:%M:%S",
-  periods: ["AM", "PM"], // unused
-  days: ["Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"],
-  shortDays: ["So", "Mo", "Di", "Mi", "Do", "Fr", "Sa"],
-  months: ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"],
-  shortMonths: ["Jan", "Feb", "Mrz", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"]
-});
diff --git a/src/locale/de-DE.js b/src/locale/de-DE.js
deleted file mode 100644
index a497ac48a7fae..0000000000000
--- a/src/locale/de-DE.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_deDE = d3.locale({
-  decimal: ",",
-  thousands: ".",
-  grouping: [3],
-  currency: ["", " €"],
-  dateTime: "%A, der %e. %B %Y, %X",
-  date: "%d.%m.%Y",
-  time: "%H:%M:%S",
-  periods: ["AM", "PM"], // unused
-  days: ["Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"],
-  shortDays: ["So", "Mo", "Di", "Mi", "Do", "Fr", "Sa"],
-  months: ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"],
-  shortMonths: ["Jan", "Feb", "Mrz", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"]
-});
diff --git a/src/locale/en-CA.js b/src/locale/en-CA.js
deleted file mode 100644
index 64853cfe04b55..0000000000000
--- a/src/locale/en-CA.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_enCA = d3.locale({
-  decimal: ".",
-  thousands: ",",
-  grouping: [3],
-  currency: ["$", ""],
-  dateTime: "%a %b %e %X %Y",
-  date: "%Y-%m-%d",
-  time: "%H:%M:%S",
-  periods: ["AM", "PM"],
-  days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
-  shortDays: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
-  months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
-  shortMonths: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
-});
diff --git a/src/locale/en-GB.js b/src/locale/en-GB.js
deleted file mode 100644
index 10414bbd790e2..0000000000000
--- a/src/locale/en-GB.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_enGB = d3.locale({
-  decimal: ".",
-  thousands: ",",
-  grouping: [3],
-  currency: ["£", ""],
-  dateTime: "%a %e %b %X %Y",
-  date: "%d/%m/%Y",
-  time: "%H:%M:%S",
-  periods: ["AM", "PM"],
-  days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
-  shortDays: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
-  months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
-  shortMonths: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
-});
diff --git a/src/locale/en-US.js b/src/locale/en-US.js
deleted file mode 100644
index 4fa8547bfde13..0000000000000
--- a/src/locale/en-US.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_enUS = d3.locale({
-  decimal: ".",
-  thousands: ",",
-  grouping: [3],
-  currency: ["$", ""],
-  dateTime: "%a %b %e %X %Y",
-  date: "%m/%d/%Y",
-  time: "%H:%M:%S",
-  periods: ["AM", "PM"],
-  days: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
-  shortDays: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
-  months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
-  shortMonths: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
-});
diff --git a/src/locale/es-ES.js b/src/locale/es-ES.js
deleted file mode 100644
index 839b2a69a3c57..0000000000000
--- a/src/locale/es-ES.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_esES = d3.locale({
-  decimal: ",",
-  thousands: ".",
-  grouping: [3],
-  currency: ["", " €"],
-  dateTime: "%A, %e de %B de %Y, %X",
-  date: "%d/%m/%Y",
-  time: "%H:%M:%S",
-  periods: ["AM", "PM"],
-  days: ["domingo", "lunes", "martes", "miércoles", "jueves", "viernes", "sábado"],
-  shortDays: ["dom", "lun", "mar", "mié", "jue", "vie", "sáb"],
-  months: ["enero", "febrero", "marzo", "abril", "mayo", "junio", "julio", "agosto", "septiembre", "octubre", "noviembre", "diciembre"],
-  shortMonths: ["ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"]
-});
diff --git a/src/locale/fi-FI.js b/src/locale/fi-FI.js
deleted file mode 100644
index 05e5eeb98e9c3..0000000000000
--- a/src/locale/fi-FI.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_fiFI = d3.locale({
-  decimal: ",",
-  thousands: "\xa0",
-  grouping: [3],
-  currency: ["", "\xa0€"],
-  dateTime: "%A, %-d. %Bta %Y klo %X",
-  date: "%-d.%-m.%Y",
-  time: "%H:%M:%S",
-  periods: ["a.m.", "p.m."],
-  days: ["sunnuntai", "maanantai", "tiistai", "keskiviikko", "torstai", "perjantai", "lauantai"],
-  shortDays: ["Su", "Ma", "Ti", "Ke", "To", "Pe", "La"],
-  months: ["tammikuu", "helmikuu", "maaliskuu", "huhtikuu", "toukokuu", "kesäkuu", "heinäkuu", "elokuu", "syyskuu", "lokakuu", "marraskuu", "joulukuu"],
-  shortMonths: ["Tammi", "Helmi", "Maalis", "Huhti", "Touko", "Kesä", "Heinä", "Elo", "Syys", "Loka", "Marras", "Joulu"]
-});
diff --git a/src/locale/fr-CA.js b/src/locale/fr-CA.js
deleted file mode 100644
index a18c39f9ab6a7..0000000000000
--- a/src/locale/fr-CA.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_frCA = d3.locale({
-  decimal: ",",
-  thousands: "\xa0",
-  grouping: [3],
-  currency: ["", "$"],
-  dateTime: "%a %e %b %Y %X",
-  date: "%Y-%m-%d",
-  time: "%H:%M:%S",
-  periods: ["", ""],
-  days: ["dimanche", "lundi", "mardi", "mercredi", "jeudi", "vendredi", "samedi"],
-  shortDays: ["dim", "lun", "mar", "mer", "jeu", "ven", "sam"],
-  months: ["janvier", "février", "mars", "avril", "mai", "juin", "juillet", "août", "septembre", "octobre", "novembre", "décembre"],
-  shortMonths: ["jan", "fév", "mar", "avr", "mai", "jui", "jul", "aoû", "sep", "oct", "nov", "déc"]
-});
diff --git a/src/locale/fr-FR.js b/src/locale/fr-FR.js
deleted file mode 100644
index 1afd400850ea6..0000000000000
--- a/src/locale/fr-FR.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_frFR = d3.locale({
-  decimal: ",",
-  thousands: ".",
-  grouping: [3],
-  currency: ["", " €"],
-  dateTime: "%A, le %e %B %Y, %X",
-  date: "%d/%m/%Y",
-  time: "%H:%M:%S",
-  periods: ["AM", "PM"], // unused
-  days: ["dimanche", "lundi", "mardi", "mercredi", "jeudi", "vendredi", "samedi"],
-  shortDays: ["dim.", "lun.", "mar.", "mer.", "jeu.", "ven.", "sam."],
-  months: ["janvier", "février", "mars", "avril", "mai", "juin", "juillet", "août", "septembre", "octobre", "novembre", "décembre"],
-  shortMonths: ["janv.", "févr.", "mars", "avr.", "mai", "juin", "juil.", "août", "sept.", "oct.", "nov.", "déc."]
-});
diff --git a/src/locale/he-IL.js b/src/locale/he-IL.js
deleted file mode 100644
index c840cc843a57d..0000000000000
--- a/src/locale/he-IL.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_heIL = d3.locale({
-  decimal: ".",
-  thousands: ",",
-  grouping: [3],
-  currency: ["₪", ""],
-  dateTime: "%A, %e ב%B %Y %X",
-  date: "%d.%m.%Y",
-  time: "%H:%M:%S",
-  periods: ["AM", "PM"],
-  days: ["ראשון", "שני", "שלישי", "רביעי", "חמישי", "שישי", "שבת"],
-  shortDays: ["א׳", "ב׳", "ג׳", "ד׳", "ה׳", "ו׳", "ש׳"],
-  months: ["ינואר", "פברואר", "מרץ", "אפריל", "מאי", "יוני", "יולי", "אוגוסט", "ספטמבר", "אוקטובר", "נובמבר", "דצמבר"],
-  shortMonths: ["ינו׳", "פבר׳", "מרץ", "אפר׳", "מאי", "יוני", "יולי", "אוג׳", "ספט׳", "אוק׳", "נוב׳", "דצמ׳"]
-});
diff --git a/src/locale/hu-HU.js b/src/locale/hu-HU.js
deleted file mode 100644
index 4bfff72274372..0000000000000
--- a/src/locale/hu-HU.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_huHU = d3.locale({
-  decimal: ",",
-  thousands: "\xa0",
-  grouping: [3],
-  currency: ["", "\xa0Ft"],
-  dateTime: "%Y. %B %-e., %A %X",
-  date: "%Y. %m. %d.",
-  time: "%H:%M:%S",
-  periods: ["de.", "du."], // unused
-  days: ["vasárnap", "hétfő", "kedd", "szerda", "csütörtök", "péntek", "szombat"],
-  shortDays: ["V", "H", "K", "Sze", "Cs", "P", "Szo"],
-  months: ["január", "február", "március", "április", "május", "június", "július", "augusztus", "szeptember", "október", "november", "december"],
-  shortMonths: ["jan.", "feb.", "már.", "ápr.", "máj.", "jún.", "júl.", "aug.", "szept.", "okt.", "nov.", "dec."]
-});
diff --git a/src/locale/it-IT.js b/src/locale/it-IT.js
deleted file mode 100644
index aec9202ef631a..0000000000000
--- a/src/locale/it-IT.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_itIT = d3.locale({
-  decimal: ",",
-  thousands: ".",
-  grouping: [3],
-  currency: ["€", ""],
-  dateTime: "%A %e %B %Y, %X",
-  date: "%d/%m/%Y",
-  time: "%H:%M:%S",
-  periods: ["AM", "PM"], // unused
-  days: ["Domenica", "Lunedì", "Martedì", "Mercoledì", "Giovedì", "Venerdì", "Sabato"],
-  shortDays: ["Dom", "Lun", "Mar", "Mer", "Gio", "Ven", "Sab"],
-  months: ["Gennaio", "Febbraio", "Marzo", "Aprile", "Maggio", "Giugno", "Luglio", "Agosto", "Settembre", "Ottobre", "Novembre", "Dicembre"],
-  shortMonths: ["Gen", "Feb", "Mar", "Apr", "Mag", "Giu", "Lug", "Ago", "Set", "Ott", "Nov", "Dic"]
-});
diff --git a/src/locale/ja-JP.js b/src/locale/ja-JP.js
deleted file mode 100644
index 45efb48fbf2fb..0000000000000
--- a/src/locale/ja-JP.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_jaJP = d3.locale({
-  decimal: ".",
-  thousands: ",",
-  grouping: [3],
-  currency: ["", "円"],
-  dateTime: "%Y %b %e %a %X",
-  date: "%Y/%m/%d",
-  time: "%H:%M:%S",
-  periods: ["AM", "PM"],
-  days: ["日曜日", "月曜日", "火曜日", "水曜日", "木曜日", "金曜日", "土曜日"],
-  shortDays: ["日", "月", "火", "水", "木", "金", "土"],
-  months: ["睦月", "如月", "弥生", "卯月", "皐月", "水無月", "文月", "葉月", "長月", "神無月", "霜月", "師走"],
-  shortMonths: ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"]
-});
\ No newline at end of file
diff --git a/src/locale/ko-KR.js b/src/locale/ko-KR.js
deleted file mode 100644
index 3638bb3fad769..0000000000000
--- a/src/locale/ko-KR.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_koKR = d3.locale({
-  decimal: ".",
-  thousands: ",",
-  grouping: [3],
-  currency: ["₩", ""],
-  dateTime: "%Y/%m/%d %a %X",
-  date: "%Y/%m/%d",
-  time: "%H:%M:%S",
-  periods: ["오전", "오후"],
-  days: ["일요일", "월요일", "화요일", "수요일", "목요일", "금요일", "토요일"],
-  shortDays: ["일", "월", "화", "수", "목", "금", "토"],
-  months: ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"],
-  shortMonths: ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"]
-});
diff --git a/src/locale/locale.js b/src/locale/locale.js
deleted file mode 100644
index b3b9950e29d22..0000000000000
--- a/src/locale/locale.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import "number-format";
-import "time-format";
-
-d3.locale = function(locale) {
-  return {
-    numberFormat: d3_locale_numberFormat(locale),
-    timeFormat: d3_locale_timeFormat(locale)
-  };
-};
diff --git a/src/locale/mk-MK.js b/src/locale/mk-MK.js
deleted file mode 100644
index 7b618c4416319..0000000000000
--- a/src/locale/mk-MK.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_mkMK = d3.locale({
-  decimal: ",",
-  thousands: ".",
-  grouping: [3],
-  currency: ["", " ден."],
-  dateTime: "%A, %e %B %Y г. %X",
-  date: "%d.%m.%Y",
-  time: "%H:%M:%S",
-  periods: ["AM", "PM"],
-  days: ["недела", "понеделник", "вторник", "среда", "четврток", "петок", "сабота"],
-  shortDays: ["нед", "пон", "вто", "сре", "чет", "пет", "саб"],
-  months: ["јануари", "февруари", "март", "април", "мај", "јуни", "јули", "август", "септември", "октомври", "ноември", "декември"],
-  shortMonths: ["јан", "фев", "мар", "апр", "мај", "јун", "јул", "авг", "сеп", "окт", "ное", "дек"]
-});
diff --git a/src/locale/nl-NL.js b/src/locale/nl-NL.js
deleted file mode 100644
index 667f92475a2af..0000000000000
--- a/src/locale/nl-NL.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_nlNL = d3.locale({
-  decimal: ",",
-  thousands: ".",
-  grouping: [3],
-  currency: ["€ ", ""],
-  dateTime: "%a %e %B %Y %T",
-  date: "%d-%m-%Y",
-  time: "%H:%M:%S",
-  periods: ["AM", "PM"], // unused
-  days: ["zondag", "maandag", "dinsdag", "woensdag", "donderdag", "vrijdag", "zaterdag"],
-  shortDays: ["zo", "ma", "di", "wo", "do", "vr", "za"],
-  months: ["januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december"],
-  shortMonths: ["jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"]
-});
diff --git a/src/locale/number-format.js b/src/locale/number-format.js
deleted file mode 100644
index e62f7b4e8b448..0000000000000
--- a/src/locale/number-format.js
+++ /dev/null
@@ -1,155 +0,0 @@
-import "../arrays/map";
-import "../core/identity";
-import "../format/formatPrefix";
-import "../format/precision";
-import "../format/round";
-
-function d3_locale_numberFormat(locale) {
-  var locale_decimal = locale.decimal,
-      locale_thousands = locale.thousands,
-      locale_grouping = locale.grouping,
-      locale_currency = locale.currency,
-      formatGroup = locale_grouping && locale_thousands ? function(value, width) {
-        var i = value.length,
-            t = [],
-            j = 0,
-            g = locale_grouping[0],
-            length = 0;
-        while (i > 0 && g > 0) {
-          if (length + g + 1 > width) g = Math.max(1, width - length);
-          t.push(value.substring(i -= g, i + g));
-          if ((length += g + 1) > width) break;
-          g = locale_grouping[j = (j + 1) % locale_grouping.length];
-        }
-        return t.reverse().join(locale_thousands);
-      } : d3_identity;
-
-  return function(specifier) {
-    var match = d3_format_re.exec(specifier),
-        fill = match[1] || " ",
-        align = match[2] || ">",
-        sign = match[3] || "-",
-        symbol = match[4] || "",
-        zfill = match[5],
-        width = +match[6],
-        comma = match[7],
-        precision = match[8],
-        type = match[9],
-        scale = 1,
-        prefix = "",
-        suffix = "",
-        integer = false,
-        exponent = true;
-
-    if (precision) precision = +precision.substring(1);
-
-    if (zfill || fill === "0" && align === "=") {
-      zfill = fill = "0";
-      align = "=";
-    }
-
-    switch (type) {
-      case "n": comma = true; type = "g"; break;
-      case "%": scale = 100; suffix = "%"; type = "f"; break;
-      case "p": scale = 100; suffix = "%"; type = "r"; break;
-      case "b":
-      case "o":
-      case "x":
-      case "X": if (symbol === "#") prefix = "0" + type.toLowerCase();
-      case "c": exponent = false;
-      case "d": integer = true; precision = 0; break;
-      case "s": scale = -1; type = "r"; break;
-    }
-
-    if (symbol === "$") prefix = locale_currency[0], suffix = locale_currency[1];
-
-    // If no precision is specified for r, fallback to general notation.
-    if (type == "r" && !precision) type = "g";
-
-    // Ensure that the requested precision is in the supported range.
-    if (precision != null) {
-      if (type == "g") precision = Math.max(1, Math.min(21, precision));
-      else if (type == "e" || type == "f") precision = Math.max(0, Math.min(20, precision));
-    }
-
-    type = d3_format_types.get(type) || d3_format_typeDefault;
-
-    var zcomma = zfill && comma;
-
-    return function(value) {
-      var fullSuffix = suffix;
-
-      // Return the empty string for floats formatted as ints.
-      if (integer && (value % 1)) return "";
-
-      // Convert negative to positive, and record the sign prefix.
-      var negative = value < 0 || value === 0 && 1 / value < 0 ? (value = -value, "-") : sign === "-" ? "" : sign;
-
-      // Apply the scale, computing it from the value's exponent for si format.
-      // Preserve the existing suffix, if any, such as the currency symbol.
-      if (scale < 0) {
-        var unit = d3.formatPrefix(value, precision);
-        value = unit.scale(value);
-        fullSuffix = unit.symbol + suffix;
-      } else {
-        value *= scale;
-      }
-
-      // Convert to the desired precision.
-      value = type(value, precision);
-
-      // Break the value into the integer part (before) and decimal part (after).
-      var i = value.lastIndexOf("."),
-          before,
-          after;
-      if (i < 0) {
-        // If there is no decimal, break on "e" where appropriate.
-        var j = exponent ? value.lastIndexOf("e") : -1;
-        if (j < 0) before = value, after = "";
-        else before = value.substring(0, j), after = value.substring(j);
-      } else {
-        before = value.substring(0, i);
-        after = locale_decimal + value.substring(i + 1);
-      }
-
-      // If the fill character is not "0", grouping is applied before padding.
-      if (!zfill && comma) before = formatGroup(before, Infinity);
-
-      var length = prefix.length + before.length + after.length + (zcomma ? 0 : negative.length),
-          padding = length < width ? new Array(length = width - length + 1).join(fill) : "";
-
-      // If the fill character is "0", grouping is applied after padding.
-      if (zcomma) before = formatGroup(padding + before, padding.length ? width - after.length : Infinity);
-
-      // Apply prefix.
-      negative += prefix;
-
-      // Rejoin integer and decimal parts.
-      value = before + after;
-
-      return (align === "<" ? negative + value + padding
-            : align === ">" ? padding + negative + value
-            : align === "^" ? padding.substring(0, length >>= 1) + negative + value + padding.substring(length)
-            : negative + (zcomma ? value : padding + value)) + fullSuffix;
-    };
-  };
-}
-
-// [[fill]align][sign][symbol][0][width][,][.precision][type]
-var d3_format_re = /(?:([^{])?([<>=^]))?([+\- ])?([$#])?(0)?(\d+)?(,)?(\.-?\d+)?([a-z%])?/i;
-
-var d3_format_types = d3.map({
-  b: function(x) { return x.toString(2); },
-  c: function(x) { return String.fromCharCode(x); },
-  o: function(x) { return x.toString(8); },
-  x: function(x) { return x.toString(16); },
-  X: function(x) { return x.toString(16).toUpperCase(); },
-  g: function(x, p) { return x.toPrecision(p); },
-  e: function(x, p) { return x.toExponential(p); },
-  f: function(x, p) { return x.toFixed(p); },
-  r: function(x, p) { return (x = d3.round(x, d3_format_precision(x, p))).toFixed(Math.max(0, Math.min(20, d3_format_precision(x * (1 + 1e-15), p)))); }
-});
-
-function d3_format_typeDefault(x) {
-  return x + "";
-}
diff --git a/src/locale/pl-PL.js b/src/locale/pl-PL.js
deleted file mode 100644
index 4f6b5876fe1fb..0000000000000
--- a/src/locale/pl-PL.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_plPL = d3.locale({
-  decimal: ",",
-  thousands: ".",
-  grouping: [3],
-  currency: ["", "zł"],
-  dateTime: "%A, %e %B %Y, %X",
-  date: "%d/%m/%Y",
-  time: "%H:%M:%S",
-  periods: ["AM", "PM"], // unused
-  days: ["Niedziela", "Poniedziałek", "Wtorek", "Środa", "Czwartek", "Piątek", "Sobota"],
-  shortDays: ["Niedz.", "Pon.", "Wt.", "Śr.", "Czw.", "Pt.", "Sob."],
-  months: ["Styczeń", "Luty", "Marzec", "Kwiecień", "Maj", "Czerwiec", "Lipiec", "Sierpień", "Wrzesień", "Październik", "Listopad", "Grudzień"],
-  shortMonths: ["Stycz.", "Luty", "Marz.", "Kwie.", "Maj", "Czerw.", "Lipc.", "Sierp.", "Wrz.", "Paźdz.", "Listop.", "Grudz."]/* In Polish language abbraviated months are not commonly used so there is a dispute about the proper abbraviations. */
-});
diff --git a/src/locale/pt-BR.js b/src/locale/pt-BR.js
deleted file mode 100644
index e80a3af307be6..0000000000000
--- a/src/locale/pt-BR.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_ptBR = d3.locale({
-  decimal: ',',
-  thousands: '.',
-  grouping: [3],
-  currency: ['R$', ''],
-  dateTime: '%A, %e de %B de %Y. %X',
-  date: '%d/%m/%Y',
-  time: '%H:%M:%S',
-  periods: ['AM', 'PM'],
-  days: ['Domingo', 'Segunda', 'Terça', 'Quarta', 'Quinta', 'Sexta', 'Sábado'],
-  shortDays: ['Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sáb'],
-  months: ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'],
-  shortMonths: ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'Ago', 'Set', 'Out', 'Nov', 'Dez']
-});
diff --git a/src/locale/ru-RU.js b/src/locale/ru-RU.js
deleted file mode 100644
index 2d3896257690c..0000000000000
--- a/src/locale/ru-RU.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_ruRU = d3.locale({
-  decimal: ",",
-  thousands: "\xa0",
-  grouping: [3],
-  currency: ["", " руб."],
-  dateTime: "%A, %e %B %Y г. %X",
-  date: "%d.%m.%Y",
-  time: "%H:%M:%S",
-  periods: ["AM", "PM"],
-  days: ["воскресенье", "понедельник", "вторник", "среда", "четверг", "пятница", "суббота"],
-  shortDays: ["вс", "пн", "вт", "ср", "чт", "пт", "сб"],
-  months: ["января", "февраля", "марта", "апреля", "мая", "июня", "июля", "августа", "сентября", "октября", "ноября", "декабря"],
-  shortMonths: ["янв", "фев", "мар", "апр", "май", "июн", "июл", "авг", "сен", "окт", "ноя", "дек"]
-});
diff --git a/src/locale/sv-SE.js b/src/locale/sv-SE.js
deleted file mode 100644
index b83dfbea0620c..0000000000000
--- a/src/locale/sv-SE.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_svSE = d3.locale({
-  decimal: ",",
-  thousands: "\xa0",
-  grouping: [3],
-  currency: ["", "SEK"],
-  dateTime: "%A den %d %B %Y %X",
-  date: "%Y-%m-%d",
-  time: "%H:%M:%S",
-  periods: ["fm", "em"],
-  days: ["Söndag", "Måndag", "Tisdag", "Onsdag", "Torsdag", "Fredag", "Lördag"],
-  shortDays: ["Sön", "Mån", "Tis", "Ons", "Tor", "Fre", "Lör"],
-  months: ["Januari", "Februari", "Mars", "April", "Maj", "Juni", "Juli", "Augusti", "September", "Oktober", "November", "December"],
-  shortMonths: ["Jan", "Feb", "Mar", "Apr", "Maj", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dec"]
-});
diff --git a/src/locale/time-format.js b/src/locale/time-format.js
deleted file mode 100644
index ccff6f1984076..0000000000000
--- a/src/locale/time-format.js
+++ /dev/null
@@ -1,370 +0,0 @@
-import "../arrays/map";
-import "../format/requote";
-import "../math/abs";
-import "../time/day";
-import "../time/time";
-import "../time/week";
-import "../time/interval";
-
-function d3_locale_timeFormat(locale) {
-  var locale_dateTime = locale.dateTime,
-      locale_date = locale.date,
-      locale_time = locale.time,
-      locale_periods = locale.periods,
-      locale_days = locale.days,
-      locale_shortDays = locale.shortDays,
-      locale_months = locale.months,
-      locale_shortMonths = locale.shortMonths;
-
-  function d3_time_format(template) {
-    var n = template.length;
-
-    function format(date) {
-      var string = [],
-          i = -1,
-          j = 0,
-          c,
-          p,
-          f;
-      while (++i < n) {
-        if (template.charCodeAt(i) === 37) {
-          string.push(template.slice(j, i));
-          if ((p = d3_time_formatPads[c = template.charAt(++i)]) != null) c = template.charAt(++i);
-          if (f = d3_time_formats[c]) c = f(date, p == null ? (c === "e" ? " " : "0") : p);
-          string.push(c);
-          j = i + 1;
-        }
-      }
-      string.push(template.slice(j, i));
-      return string.join("");
-    }
-
-    format.parse = function(string) {
-      var d = {y: 1900, m: 0, d: 1, H: 0, M: 0, S: 0, L: 0, Z: null},
-          i = d3_time_parse(d, template, string, 0);
-      if (i != string.length) return null;
-
-      // The am-pm flag is 0 for AM, and 1 for PM.
-      if ("p" in d) d.H = d.H % 12 + d.p * 12;
-
-      // If a time zone is specified, it is always relative to UTC;
-      // we need to use d3_date_utc if we aren’t already.
-      var localZ = d.Z != null && d3_date !== d3_date_utc,
-          date = new (localZ ? d3_date_utc : d3_date);
-
-      // Set year, month, date.
-      if ("j" in d) date.setFullYear(d.y, 0, d.j);
-      else if ("W" in d || "U" in d) {
-        if (!("w" in d)) d.w = "W" in d ? 1 : 0;
-        date.setFullYear(d.y, 0, 1);
-        date.setFullYear(d.y, 0, "W" in d
-            ? (d.w + 6) % 7 + d.W * 7 - (date.getDay() + 5) % 7
-            :  d.w          + d.U * 7 - (date.getDay() + 6) % 7);
-      } else date.setFullYear(d.y, d.m, d.d);
-
-      // Set hours, minutes, seconds and milliseconds.
-      date.setHours(d.H + (d.Z / 100 | 0), d.M + d.Z % 100, d.S, d.L);
-
-      return localZ ? date._ : date;
-    };
-
-    format.toString = function() {
-      return template;
-    };
-
-    return format;
-  }
-
-  function d3_time_parse(date, template, string, j) {
-    var c,
-        p,
-        t,
-        i = 0,
-        n = template.length,
-        m = string.length;
-    while (i < n) {
-      if (j >= m) return -1;
-      c = template.charCodeAt(i++);
-      if (c === 37) {
-        t = template.charAt(i++);
-        p = d3_time_parsers[t in d3_time_formatPads ? template.charAt(i++) : t];
-        if (!p || ((j = p(date, string, j)) < 0)) return -1;
-      } else if (c != string.charCodeAt(j++)) {
-        return -1;
-      }
-    }
-    return j;
-  }
-
-  d3_time_format.utc = function(template) {
-    var local = d3_time_format(template);
-
-    function format(date) {
-      try {
-        d3_date = d3_date_utc;
-        var utc = new d3_date();
-        utc._ = date;
-        return local(utc);
-      } finally {
-        d3_date = Date;
-      }
-    }
-
-    format.parse = function(string) {
-      try {
-        d3_date = d3_date_utc;
-        var date = local.parse(string);
-        return date && date._;
-      } finally {
-        d3_date = Date;
-      }
-    };
-
-    format.toString = local.toString;
-
-    return format;
-  };
-
-  d3_time_format.multi =
-  d3_time_format.utc.multi = d3_time_formatMulti;
-
-  var d3_time_periodLookup = d3.map(),
-      d3_time_dayRe = d3_time_formatRe(locale_days),
-      d3_time_dayLookup = d3_time_formatLookup(locale_days),
-      d3_time_dayAbbrevRe = d3_time_formatRe(locale_shortDays),
-      d3_time_dayAbbrevLookup = d3_time_formatLookup(locale_shortDays),
-      d3_time_monthRe = d3_time_formatRe(locale_months),
-      d3_time_monthLookup = d3_time_formatLookup(locale_months),
-      d3_time_monthAbbrevRe = d3_time_formatRe(locale_shortMonths),
-      d3_time_monthAbbrevLookup = d3_time_formatLookup(locale_shortMonths);
-
-  locale_periods.forEach(function(p, i) {
-    d3_time_periodLookup.set(p.toLowerCase(), i);
-  });
-
-  var d3_time_formats = {
-    a: function(d) { return locale_shortDays[d.getDay()]; },
-    A: function(d) { return locale_days[d.getDay()]; },
-    b: function(d) { return locale_shortMonths[d.getMonth()]; },
-    B: function(d) { return locale_months[d.getMonth()]; },
-    c: d3_time_format(locale_dateTime),
-    d: function(d, p) { return d3_time_formatPad(d.getDate(), p, 2); },
-    e: function(d, p) { return d3_time_formatPad(d.getDate(), p, 2); },
-    H: function(d, p) { return d3_time_formatPad(d.getHours(), p, 2); },
-    I: function(d, p) { return d3_time_formatPad(d.getHours() % 12 || 12, p, 2); },
-    j: function(d, p) { return d3_time_formatPad(1 + d3_time.dayOfYear(d), p, 3); },
-    L: function(d, p) { return d3_time_formatPad(d.getMilliseconds(), p, 3); },
-    m: function(d, p) { return d3_time_formatPad(d.getMonth() + 1, p, 2); },
-    M: function(d, p) { return d3_time_formatPad(d.getMinutes(), p, 2); },
-    p: function(d) { return locale_periods[+(d.getHours() >= 12)]; },
-    S: function(d, p) { return d3_time_formatPad(d.getSeconds(), p, 2); },
-    U: function(d, p) { return d3_time_formatPad(d3_time.sundayOfYear(d), p, 2); },
-    w: function(d) { return d.getDay(); },
-    W: function(d, p) { return d3_time_formatPad(d3_time.mondayOfYear(d), p, 2); },
-    x: d3_time_format(locale_date),
-    X: d3_time_format(locale_time),
-    y: function(d, p) { return d3_time_formatPad(d.getFullYear() % 100, p, 2); },
-    Y: function(d, p) { return d3_time_formatPad(d.getFullYear() % 10000, p, 4); },
-    Z: d3_time_zone,
-    "%": function() { return "%"; }
-  };
-
-  var d3_time_parsers = {
-    a: d3_time_parseWeekdayAbbrev,
-    A: d3_time_parseWeekday,
-    b: d3_time_parseMonthAbbrev,
-    B: d3_time_parseMonth,
-    c: d3_time_parseLocaleFull,
-    d: d3_time_parseDay,
-    e: d3_time_parseDay,
-    H: d3_time_parseHour24,
-    I: d3_time_parseHour24,
-    j: d3_time_parseDayOfYear,
-    L: d3_time_parseMilliseconds,
-    m: d3_time_parseMonthNumber,
-    M: d3_time_parseMinutes,
-    p: d3_time_parseAmPm,
-    S: d3_time_parseSeconds,
-    U: d3_time_parseWeekNumberSunday,
-    w: d3_time_parseWeekdayNumber,
-    W: d3_time_parseWeekNumberMonday,
-    x: d3_time_parseLocaleDate,
-    X: d3_time_parseLocaleTime,
-    y: d3_time_parseYear,
-    Y: d3_time_parseFullYear,
-    Z: d3_time_parseZone,
-    "%": d3_time_parseLiteralPercent
-  };
-
-  function d3_time_parseWeekdayAbbrev(date, string, i) {
-    d3_time_dayAbbrevRe.lastIndex = 0;
-    var n = d3_time_dayAbbrevRe.exec(string.slice(i));
-    return n ? (date.w = d3_time_dayAbbrevLookup.get(n[0].toLowerCase()), i + n[0].length) : -1;
-  }
-
-  function d3_time_parseWeekday(date, string, i) {
-    d3_time_dayRe.lastIndex = 0;
-    var n = d3_time_dayRe.exec(string.slice(i));
-    return n ? (date.w = d3_time_dayLookup.get(n[0].toLowerCase()), i + n[0].length) : -1;
-  }
-
-  function d3_time_parseMonthAbbrev(date, string, i) {
-    d3_time_monthAbbrevRe.lastIndex = 0;
-    var n = d3_time_monthAbbrevRe.exec(string.slice(i));
-    return n ? (date.m = d3_time_monthAbbrevLookup.get(n[0].toLowerCase()), i + n[0].length) : -1;
-  }
-
-  function d3_time_parseMonth(date, string, i) {
-    d3_time_monthRe.lastIndex = 0;
-    var n = d3_time_monthRe.exec(string.slice(i));
-    return n ? (date.m = d3_time_monthLookup.get(n[0].toLowerCase()), i + n[0].length) : -1;
-  }
-
-  function d3_time_parseLocaleFull(date, string, i) {
-    return d3_time_parse(date, d3_time_formats.c.toString(), string, i);
-  }
-
-  function d3_time_parseLocaleDate(date, string, i) {
-    return d3_time_parse(date, d3_time_formats.x.toString(), string, i);
-  }
-
-  function d3_time_parseLocaleTime(date, string, i) {
-    return d3_time_parse(date, d3_time_formats.X.toString(), string, i);
-  }
-
-  function d3_time_parseAmPm(date, string, i) {
-    var n = d3_time_periodLookup.get(string.slice(i, i += 2).toLowerCase());
-    return n == null ? -1 : (date.p = n, i);
-  }
-
-  return d3_time_format;
-}
-
-var d3_time_formatPads = {"-": "", "_": " ", "0": "0"},
-    d3_time_numberRe = /^\s*\d+/, // note: ignores next directive
-    d3_time_percentRe = /^%/;
-
-function d3_time_formatPad(value, fill, width) {
-  var sign = value < 0 ? "-" : "",
-      string = (sign ? -value : value) + "",
-      length = string.length;
-  return sign + (length < width ? new Array(width - length + 1).join(fill) + string : string);
-}
-
-function d3_time_formatRe(names) {
-  return new RegExp("^(?:" + names.map(d3.requote).join("|") + ")", "i");
-}
-
-function d3_time_formatLookup(names) {
-  var map = new d3_Map, i = -1, n = names.length;
-  while (++i < n) map.set(names[i].toLowerCase(), i);
-  return map;
-}
-
-function d3_time_parseWeekdayNumber(date, string, i) {
-  d3_time_numberRe.lastIndex = 0;
-  var n = d3_time_numberRe.exec(string.slice(i, i + 1));
-  return n ? (date.w = +n[0], i + n[0].length) : -1;
-}
-
-function d3_time_parseWeekNumberSunday(date, string, i) {
-  d3_time_numberRe.lastIndex = 0;
-  var n = d3_time_numberRe.exec(string.slice(i));
-  return n ? (date.U = +n[0], i + n[0].length) : -1;
-}
-
-function d3_time_parseWeekNumberMonday(date, string, i) {
-  d3_time_numberRe.lastIndex = 0;
-  var n = d3_time_numberRe.exec(string.slice(i));
-  return n ? (date.W = +n[0], i + n[0].length) : -1;
-}
-
-function d3_time_parseFullYear(date, string, i) {
-  d3_time_numberRe.lastIndex = 0;
-  var n = d3_time_numberRe.exec(string.slice(i, i + 4));
-  return n ? (date.y = +n[0], i + n[0].length) : -1;
-}
-
-function d3_time_parseYear(date, string, i) {
-  d3_time_numberRe.lastIndex = 0;
-  var n = d3_time_numberRe.exec(string.slice(i, i + 2));
-  return n ? (date.y = d3_time_expandYear(+n[0]), i + n[0].length) : -1;
-}
-
-function d3_time_parseZone(date, string, i) {
-  return /^[+-]\d{4}$/.test(string = string.slice(i, i + 5))
-      ? (date.Z = -string, i + 5) // sign differs from getTimezoneOffset!
-      : -1;
-}
-
-function d3_time_expandYear(d) {
-  return d + (d > 68 ? 1900 : 2000);
-}
-
-function d3_time_parseMonthNumber(date, string, i) {
-  d3_time_numberRe.lastIndex = 0;
-  var n = d3_time_numberRe.exec(string.slice(i, i + 2));
-  return n ? (date.m = n[0] - 1, i + n[0].length) : -1;
-}
-
-function d3_time_parseDay(date, string, i) {
-  d3_time_numberRe.lastIndex = 0;
-  var n = d3_time_numberRe.exec(string.slice(i, i + 2));
-  return n ? (date.d = +n[0], i + n[0].length) : -1;
-}
-
-function d3_time_parseDayOfYear(date, string, i) {
-  d3_time_numberRe.lastIndex = 0;
-  var n = d3_time_numberRe.exec(string.slice(i, i + 3));
-  return n ? (date.j = +n[0], i + n[0].length) : -1;
-}
-
-// Note: we don't validate that the hour is in the range [0,23] or [1,12].
-function d3_time_parseHour24(date, string, i) {
-  d3_time_numberRe.lastIndex = 0;
-  var n = d3_time_numberRe.exec(string.slice(i, i + 2));
-  return n ? (date.H = +n[0], i + n[0].length) : -1;
-}
-
-function d3_time_parseMinutes(date, string, i) {
-  d3_time_numberRe.lastIndex = 0;
-  var n = d3_time_numberRe.exec(string.slice(i, i + 2));
-  return n ? (date.M = +n[0], i + n[0].length) : -1;
-}
-
-function d3_time_parseSeconds(date, string, i) {
-  d3_time_numberRe.lastIndex = 0;
-  var n = d3_time_numberRe.exec(string.slice(i, i + 2));
-  return n ? (date.S = +n[0], i + n[0].length) : -1;
-}
-
-function d3_time_parseMilliseconds(date, string, i) {
-  d3_time_numberRe.lastIndex = 0;
-  var n = d3_time_numberRe.exec(string.slice(i, i + 3));
-  return n ? (date.L = +n[0], i + n[0].length) : -1;
-}
-
-// TODO table of time zone offset names?
-function d3_time_zone(d) {
-  var z = d.getTimezoneOffset(),
-      zs = z > 0 ? "-" : "+",
-      zh = abs(z) / 60 | 0,
-      zm = abs(z) % 60;
-  return zs + d3_time_formatPad(zh, "0", 2) + d3_time_formatPad(zm, "0", 2);
-}
-
-function d3_time_parseLiteralPercent(date, string, i) {
-  d3_time_percentRe.lastIndex = 0;
-  var n = d3_time_percentRe.exec(string.slice(i, i + 1));
-  return n ? i + n[0].length : -1;
-}
-
-function d3_time_formatMulti(formats) {
-  var n = formats.length, i = -1;
-  while (++i < n) formats[i][0] = this(formats[i][0]);
-  return function(date) {
-    var i = 0, f = formats[i];
-    while (!f[1](date)) f = formats[++i];
-    return f[0](date);
-  };
-}
diff --git a/src/locale/time-scale.js b/src/locale/time-scale.js
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/src/locale/zh-CN.js b/src/locale/zh-CN.js
deleted file mode 100644
index 417a5ff6df7ab..0000000000000
--- a/src/locale/zh-CN.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "locale";
-
-var d3_locale_zhCN = d3.locale({
-  decimal: ".",
-  thousands: ",",
-  grouping: [3],
-  currency: ["¥", ""],
-  dateTime: "%x %A %X",
-  date: "%Y年%-m月%-d日",
-  time: "%H:%M:%S",
-  periods: ["上午", "下午"],
-  days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
-  shortDays: ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
-  months: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
-  shortMonths: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"]
-});
diff --git a/src/scale/linear.js b/src/scale/linear.js
index 0dc1426fa78ad..1b60a2c650bdd 100644
--- a/src/scale/linear.js
+++ b/src/scale/linear.js
@@ -3,7 +3,6 @@ import "../core/rebind";
 import "../interpolate/interpolate";
 import "../interpolate/round";
 import "../interpolate/uninterpolate";
-import "../format/format";
 import "../math/abs";
 import "bilinear";
 import "nice";
@@ -117,28 +116,6 @@ function d3_scale_linearTicks(domain, m) {
   return d3.range.apply(d3, d3_scale_linearTickRange(domain, m));
 }
 
-function d3_scale_linearTickFormat(domain, m, format) {
-  var range = d3_scale_linearTickRange(domain, m);
-  if (format) {
-    var match = d3_format_re.exec(format);
-    match.shift();
-    if (match[8] === "s") {
-      var prefix = d3.formatPrefix(Math.max(abs(range[0]), abs(range[1])));
-      if (!match[7]) match[7] = "." + d3_scale_linearPrecision(prefix.scale(range[2]));
-      match[8] = "f";
-      format = d3.format(match.join(""));
-      return function(d) {
-        return format(prefix.scale(d)) + prefix.symbol;
-      };
-    }
-    if (!match[7]) match[7] = "." + d3_scale_linearFormatPrecision(match[8], range);
-    format = match.join("");
-  } else {
-    format = ",." + d3_scale_linearPrecision(range[2]) + "f";
-  }
-  return d3.format(format);
-}
-
 var d3_scale_linearFormatSignificant = {s: 1, g: 1, p: 1, r: 1, e: 1};
 
 // Returns the number of significant digits after the decimal point.
diff --git a/src/scale/log.js b/src/scale/log.js
index fe264fa41598c..9ba4289dcdea5 100644
--- a/src/scale/log.js
+++ b/src/scale/log.js
@@ -1,4 +1,3 @@
-import "../format/format";
 import "linear";
 import "nice";
 import "scale";
@@ -69,18 +68,6 @@ function d3_scale_log(linear, base, positive, domain) {
     return ticks;
   };
 
-  scale.tickFormat = function(n, format) {
-    if (!arguments.length) return d3_scale_logFormat;
-    if (arguments.length < 2) format = d3_scale_logFormat;
-    else if (typeof format !== "function") format = d3.format(format);
-    var k = Math.max(1, base * n / scale.ticks().length);
-    return function(d) {
-      var i = d / pow(Math.round(log(d)));
-      if (i * base < base - 0.5) i *= base;
-      return i <= k ? format(d) : "";
-    };
-  };
-
   scale.copy = function() {
     return d3_scale_log(linear.copy(), base, positive, domain);
   };
@@ -88,5 +75,4 @@ function d3_scale_log(linear, base, positive, domain) {
   return d3_scale_linearRebind(scale, linear);
 }
 
-var d3_scale_logFormat = d3.format(".0e"),
-    d3_scale_logNiceNegative = {floor: function(x) { return -Math.ceil(-x); }, ceil: function(x) { return -Math.floor(-x); }};
+var d3_scale_logNiceNegative = {floor: function(x) { return -Math.ceil(-x); }, ceil: function(x) { return -Math.floor(-x); }};
diff --git a/src/time/day.js b/src/time/day.js
deleted file mode 100644
index 3b8e7dec0c267..0000000000000
--- a/src/time/day.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import "interval";
-import "time";
-import "year";
-
-d3_time.day = d3_time_interval(function(date) {
-  var day = new d3_date(2000, 0);
-  day.setFullYear(date.getFullYear(), date.getMonth(), date.getDate());
-  return day;
-}, function(date, offset) {
-  date.setDate(date.getDate() + offset);
-}, function(date) {
-  return date.getDate() - 1;
-});
-
-d3_time.days = d3_time.day.range;
-d3_time.days.utc = d3_time.day.utc.range;
-
-d3_time.dayOfYear = function(date) {
-  var year = d3_time.year(date);
-  return Math.floor((date - year - (date.getTimezoneOffset() - year.getTimezoneOffset()) * 6e4) / 864e5);
-};
diff --git a/src/time/format-iso.js b/src/time/format-iso.js
deleted file mode 100644
index 1bcd860ce0ec7..0000000000000
--- a/src/time/format-iso.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import "format";
-import "format-utc";
-
-var d3_time_formatIso = d3_time_formatUtc("%Y-%m-%dT%H:%M:%S.%LZ");
-
-d3_time_format.iso = Date.prototype.toISOString && +new Date("2000-01-01T00:00:00.000Z")
-    ? d3_time_formatIsoNative
-    : d3_time_formatIso;
-
-function d3_time_formatIsoNative(date) {
-  return date.toISOString();
-}
-
-d3_time_formatIsoNative.parse = function(string) {
-  var date = new Date(string);
-  return isNaN(date) ? null : date;
-};
-
-d3_time_formatIsoNative.toString = d3_time_formatIso.toString;
diff --git a/src/time/format-utc.js b/src/time/format-utc.js
deleted file mode 100644
index f5b4808c088d2..0000000000000
--- a/src/time/format-utc.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import "format";
-
-var d3_time_formatUtc = d3_time_format.utc;
diff --git a/src/time/format.js b/src/time/format.js
deleted file mode 100644
index 3ad7f5f6dee04..0000000000000
--- a/src/time/format.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import "../locale/en-US";
-import "time";
-
-var d3_time_format = d3_time.format = d3_locale_enUS.timeFormat;
diff --git a/src/time/hour.js b/src/time/hour.js
deleted file mode 100644
index 0c6011d283e9d..0000000000000
--- a/src/time/hour.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import "interval";
-import "time";
-
-d3_time.hour = d3_time_interval(function(date) {
-  var timezone = date.getTimezoneOffset() / 60;
-  return new d3_date((Math.floor(date / 36e5 - timezone) + timezone) * 36e5);
-}, function(date, offset) {
-  date.setTime(date.getTime() + Math.floor(offset) * 36e5); // DST breaks setHours
-}, function(date) {
-  return date.getHours();
-});
-
-d3_time.hours = d3_time.hour.range;
-d3_time.hours.utc = d3_time.hour.utc.range;
diff --git a/src/time/index.js b/src/time/index.js
deleted file mode 100644
index b041fc6dd32c1..0000000000000
--- a/src/time/index.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import "time";
-import "format";
-import "format-utc";
-import "format-iso";
-import "interval";
-import "second";
-import "minute";
-import "hour";
-import "day";
-import "week";
-import "month";
-import "year";
-import "scale";
-import "scale-utc";
diff --git a/src/time/interval.js b/src/time/interval.js
deleted file mode 100644
index b177b2001694d..0000000000000
--- a/src/time/interval.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import "time";
-
-function d3_time_interval(local, step, number) {
-
-  function round(date) {
-    var d0 = local(date), d1 = offset(d0, 1);
-    return date - d0 < d1 - date ? d0 : d1;
-  }
-
-  function ceil(date) {
-    step(date = local(new d3_date(date - 1)), 1);
-    return date;
-  }
-
-  function offset(date, k) {
-    step(date = new d3_date(+date), k);
-    return date;
-  }
-
-  function range(t0, t1, dt) {
-    var time = ceil(t0), times = [];
-    if (dt > 1) {
-      while (time < t1) {
-        if (!(number(time) % dt)) times.push(new Date(+time));
-        step(time, 1);
-      }
-    } else {
-      while (time < t1) times.push(new Date(+time)), step(time, 1);
-    }
-    return times;
-  }
-
-  function range_utc(t0, t1, dt) {
-    try {
-      d3_date = d3_date_utc;
-      var utc = new d3_date_utc();
-      utc._ = t0;
-      return range(utc, t1, dt);
-    } finally {
-      d3_date = Date;
-    }
-  }
-
-  local.floor = local;
-  local.round = round;
-  local.ceil = ceil;
-  local.offset = offset;
-  local.range = range;
-
-  var utc = local.utc = d3_time_interval_utc(local);
-  utc.floor = utc;
-  utc.round = d3_time_interval_utc(round);
-  utc.ceil = d3_time_interval_utc(ceil);
-  utc.offset = d3_time_interval_utc(offset);
-  utc.range = range_utc;
-
-  return local;
-}
-
-function d3_time_interval_utc(method) {
-  return function(date, k) {
-    try {
-      d3_date = d3_date_utc;
-      var utc = new d3_date_utc();
-      utc._ = date;
-      return method(utc, k)._;
-    } finally {
-      d3_date = Date;
-    }
-  };
-}
diff --git a/src/time/minute.js b/src/time/minute.js
deleted file mode 100644
index ad081f68c4e2c..0000000000000
--- a/src/time/minute.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import "interval";
-import "time";
-
-d3_time.minute = d3_time_interval(function(date) {
-  return new d3_date(Math.floor(date / 6e4) * 6e4);
-}, function(date, offset) {
-  date.setTime(date.getTime() + Math.floor(offset) * 6e4); // DST breaks setMinutes
-}, function(date) {
-  return date.getMinutes();
-});
-
-d3_time.minutes = d3_time.minute.range;
-d3_time.minutes.utc = d3_time.minute.utc.range;
diff --git a/src/time/month.js b/src/time/month.js
deleted file mode 100644
index 577d5b20f8a1b..0000000000000
--- a/src/time/month.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "day";
-import "interval";
-import "time";
-
-d3_time.month = d3_time_interval(function(date) {
-  date = d3_time.day(date);
-  date.setDate(1);
-  return date;
-}, function(date, offset) {
-  date.setMonth(date.getMonth() + offset);
-}, function(date) {
-  return date.getMonth();
-});
-
-d3_time.months = d3_time.month.range;
-d3_time.months.utc = d3_time.month.utc.range;
diff --git a/src/time/scale-utc.js b/src/time/scale-utc.js
deleted file mode 100644
index 1c6e30fe6e767..0000000000000
--- a/src/time/scale-utc.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import "../core/true";
-import "../scale/linear";
-import "scale";
-import "format-utc";
-
-var d3_time_scaleUtcMethods = d3_time_scaleLocalMethods.map(function(m) {
-  return [m[0].utc, m[1]];
-});
-
-var d3_time_scaleUtcFormat = d3_time_formatUtc.multi([
-  [".%L", function(d) { return d.getUTCMilliseconds(); }],
-  [":%S", function(d) { return d.getUTCSeconds(); }],
-  ["%I:%M", function(d) { return d.getUTCMinutes(); }],
-  ["%I %p", function(d) { return d.getUTCHours(); }],
-  ["%a %d", function(d) { return d.getUTCDay() && d.getUTCDate() != 1; }],
-  ["%b %d", function(d) { return d.getUTCDate() != 1; }],
-  ["%B", function(d) { return d.getUTCMonth(); }],
-  ["%Y", d3_true]
-]);
-
-d3_time_scaleUtcMethods.year = d3_time.year.utc;
-
-d3_time.scale.utc = function() {
-  return d3_time_scale(d3.scale.linear(), d3_time_scaleUtcMethods, d3_time_scaleUtcFormat);
-};
diff --git a/src/time/scale.js b/src/time/scale.js
deleted file mode 100644
index 90a23df9ea7db..0000000000000
--- a/src/time/scale.js
+++ /dev/null
@@ -1,155 +0,0 @@
-import "../arrays/bisect";
-import "../arrays/range";
-import "../core/identity";
-import "../core/true";
-import "../scale/linear";
-import "../scale/nice";
-import "format";
-import "day";
-import "hour";
-import "minute";
-import "month";
-import "second";
-import "time";
-import "week";
-import "year";
-
-function d3_time_scale(linear, methods, format) {
-
-  function scale(x) {
-    return linear(x);
-  }
-
-  scale.invert = function(x) {
-    return d3_time_scaleDate(linear.invert(x));
-  };
-
-  scale.domain = function(x) {
-    if (!arguments.length) return linear.domain().map(d3_time_scaleDate);
-    linear.domain(x);
-    return scale;
-  };
-
-  function tickMethod(extent, count) {
-    var span = extent[1] - extent[0],
-        target = span / count,
-        i = d3.bisect(d3_time_scaleSteps, target);
-    return i == d3_time_scaleSteps.length ? [methods.year, d3_scale_linearTickRange(extent.map(function(d) { return d / 31536e6; }), count)[2]]
-        : !i ? [d3_time_scaleMilliseconds, d3_scale_linearTickRange(extent, count)[2]]
-        : methods[target / d3_time_scaleSteps[i - 1] < d3_time_scaleSteps[i] / target ? i - 1 : i];
-  }
-
-  scale.nice = function(interval, skip) {
-    var domain = scale.domain(),
-        extent = d3_scaleExtent(domain),
-        method = interval == null ? tickMethod(extent, 10)
-          : typeof interval === "number" && tickMethod(extent, interval);
-
-    if (method) interval = method[0], skip = method[1];
-
-    function skipped(date) {
-      return !isNaN(date) && !interval.range(date, d3_time_scaleDate(+date + 1), skip).length;
-    }
-
-    return scale.domain(d3_scale_nice(domain, skip > 1 ? {
-      floor: function(date) {
-        while (skipped(date = interval.floor(date))) date = d3_time_scaleDate(date - 1);
-        return date;
-      },
-      ceil: function(date) {
-        while (skipped(date = interval.ceil(date))) date = d3_time_scaleDate(+date + 1);
-        return date;
-      }
-    } : interval));
-  };
-
-  scale.ticks = function(interval, skip) {
-    var extent = d3_scaleExtent(scale.domain()),
-        method = interval == null ? tickMethod(extent, 10)
-          : typeof interval === "number" ? tickMethod(extent, interval)
-          : !interval.range && [{range: interval}, skip]; // assume deprecated range function
-
-    if (method) interval = method[0], skip = method[1];
-
-    return interval.range(extent[0], d3_time_scaleDate(+extent[1] + 1), skip < 1 ? 1 : skip); // inclusive upper bound
-  };
-
-  scale.tickFormat = function() {
-    return format;
-  };
-
-  scale.copy = function() {
-    return d3_time_scale(linear.copy(), methods, format);
-  };
-
-  return d3_scale_linearRebind(scale, linear);
-}
-
-function d3_time_scaleDate(t) {
-  return new Date(t);
-}
-
-var d3_time_scaleSteps = [
-  1e3,    // 1-second
-  5e3,    // 5-second
-  15e3,   // 15-second
-  3e4,    // 30-second
-  6e4,    // 1-minute
-  3e5,    // 5-minute
-  9e5,    // 15-minute
-  18e5,   // 30-minute
-  36e5,   // 1-hour
-  108e5,  // 3-hour
-  216e5,  // 6-hour
-  432e5,  // 12-hour
-  864e5,  // 1-day
-  1728e5, // 2-day
-  6048e5, // 1-week
-  2592e6, // 1-month
-  7776e6, // 3-month
-  31536e6 // 1-year
-];
-
-var d3_time_scaleLocalMethods = [
-  [d3_time.second, 1],
-  [d3_time.second, 5],
-  [d3_time.second, 15],
-  [d3_time.second, 30],
-  [d3_time.minute, 1],
-  [d3_time.minute, 5],
-  [d3_time.minute, 15],
-  [d3_time.minute, 30],
-  [d3_time.hour, 1],
-  [d3_time.hour, 3],
-  [d3_time.hour, 6],
-  [d3_time.hour, 12],
-  [d3_time.day, 1],
-  [d3_time.day, 2],
-  [d3_time.week, 1],
-  [d3_time.month, 1],
-  [d3_time.month, 3],
-  [d3_time.year, 1]
-];
-
-var d3_time_scaleLocalFormat = d3_time_format.multi([
-  [".%L", function(d) { return d.getMilliseconds(); }],
-  [":%S", function(d) { return d.getSeconds(); }],
-  ["%I:%M", function(d) { return d.getMinutes(); }],
-  ["%I %p", function(d) { return d.getHours(); }],
-  ["%a %d", function(d) { return d.getDay() && d.getDate() != 1; }],
-  ["%b %d", function(d) { return d.getDate() != 1; }],
-  ["%B", function(d) { return d.getMonth(); }],
-  ["%Y", d3_true]
-]);
-
-var d3_time_scaleMilliseconds = {
-  range: function(start, stop, step) { return d3.range(Math.ceil(start / step) * step, +stop, step).map(d3_time_scaleDate); },
-  floor: d3_identity,
-  ceil: d3_identity
-};
-
-d3_time_scaleLocalMethods.year = d3_time.year;
-
-d3_time.scale = function() {
-  return d3_time_scale(d3.scale.linear(), d3_time_scaleLocalMethods, d3_time_scaleLocalFormat);
-};
diff --git a/src/time/second.js b/src/time/second.js
deleted file mode 100644
index 745c4b91171e6..0000000000000
--- a/src/time/second.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import "interval";
-import "time";
-
-d3_time.second = d3_time_interval(function(date) {
-  return new d3_date(Math.floor(date / 1e3) * 1e3);
-}, function(date, offset) {
-  date.setTime(date.getTime() + Math.floor(offset) * 1e3); // DST breaks setSeconds
-}, function(date) {
-  return date.getSeconds();
-});
-
-d3_time.seconds = d3_time.second.range;
-d3_time.seconds.utc = d3_time.second.utc.range;
diff --git a/src/time/time.js b/src/time/time.js
deleted file mode 100644
index ddfc018dd62ed..0000000000000
--- a/src/time/time.js
+++ /dev/null
@@ -1,33 +0,0 @@
-var d3_time = d3.time = {},
-    d3_date = Date;
-
-function d3_date_utc() {
-  this._ = new Date(arguments.length > 1
-      ? Date.UTC.apply(this, arguments)
-      : arguments[0]);
-}
-
-d3_date_utc.prototype = {
-  getDate: function() { return this._.getUTCDate(); },
-  getDay: function() { return this._.getUTCDay(); },
-  getFullYear: function() { return this._.getUTCFullYear(); },
-  getHours: function() { return this._.getUTCHours(); },
-  getMilliseconds: function() { return this._.getUTCMilliseconds(); },
-  getMinutes: function() { return this._.getUTCMinutes(); },
-  getMonth: function() { return this._.getUTCMonth(); },
-  getSeconds: function() { return this._.getUTCSeconds(); },
-  getTime: function() { return this._.getTime(); },
-  getTimezoneOffset: function() { return 0; },
-  valueOf: function() { return this._.valueOf(); },
-  setDate: function() { d3_time_prototype.setUTCDate.apply(this._, arguments); },
-  setDay: function() { d3_time_prototype.setUTCDay.apply(this._, arguments); },
-  setFullYear: function() { d3_time_prototype.setUTCFullYear.apply(this._, arguments); },
-  setHours: function() { d3_time_prototype.setUTCHours.apply(this._, arguments); },
-  setMilliseconds: function() { d3_time_prototype.setUTCMilliseconds.apply(this._, arguments); },
-  setMinutes: function() { d3_time_prototype.setUTCMinutes.apply(this._, arguments); },
-  setMonth: function() { d3_time_prototype.setUTCMonth.apply(this._, arguments); },
-  setSeconds: function() { d3_time_prototype.setUTCSeconds.apply(this._, arguments); },
-  setTime: function() { d3_time_prototype.setTime.apply(this._, arguments); }
-};
-
-var d3_time_prototype = Date.prototype;
diff --git a/src/time/week.js b/src/time/week.js
deleted file mode 100644
index 8fdfe136eb215..0000000000000
--- a/src/time/week.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import "day";
-import "interval";
-import "time";
-import "year";
-
-["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"].forEach(function(day, i) {
-  i = 7 - i;
-
-  var interval = d3_time[day] = d3_time_interval(function(date) {
-    (date = d3_time.day(date)).setDate(date.getDate() - (date.getDay() + i) % 7);
-    return date;
-  }, function(date, offset) {
-    date.setDate(date.getDate() + Math.floor(offset) * 7);
-  }, function(date) {
-    var day = d3_time.year(date).getDay();
-    return Math.floor((d3_time.dayOfYear(date) + (day + i) % 7) / 7) - (day !== i);
-  });
-
-  d3_time[day + "s"] = interval.range;
-  d3_time[day + "s"].utc = interval.utc.range;
-
-  d3_time[day + "OfYear"] = function(date) {
-    var day = d3_time.year(date).getDay();
-    return Math.floor((d3_time.dayOfYear(date) + (day + i) % 7) / 7);
-  };
-});
-
-d3_time.week = d3_time.sunday;
-d3_time.weeks = d3_time.sunday.range;
-d3_time.weeks.utc = d3_time.sunday.utc.range;
-d3_time.weekOfYear = d3_time.sundayOfYear;
diff --git a/src/time/year.js b/src/time/year.js
deleted file mode 100644
index 3ac02a2568c11..0000000000000
--- a/src/time/year.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import "day";
-import "interval";
-import "time";
-
-d3_time.year = d3_time_interval(function(date) {
-  date = d3_time.day(date);
-  date.setMonth(0, 1);
-  return date;
-}, function(date, offset) {
-  date.setFullYear(date.getFullYear() + offset);
-}, function(date) {
-  return date.getFullYear();
-});
-
-d3_time.years = d3_time.year.range;
-d3_time.years.utc = d3_time.year.utc.range;
diff --git a/test/arrays/min-test.js b/test/arrays/min-test.js
deleted file mode 100644
index 5fe331bb19c14..0000000000000
--- a/test/arrays/min-test.js
+++ /dev/null
@@ -1,51 +0,0 @@
-var vows = require("vows"),
-    _ = require("../../"),
-    load = require("../load"),
-    assert = require("../assert");
-
-var suite = vows.describe("d3.min");
-
-suite.addBatch({
-  "min": {
-    topic: load("arrays/min").expression("d3.min"),
-    "returns the least numeric value for numbers": function(min) {
-      assert.equal(min([1]), 1);
-      assert.equal(min([5, 1, 2, 3, 4]), 1);
-      assert.equal(min([20, 3]), 3);
-      assert.equal(min([3, 20]), 3);
-    },
-    "returns the least lexicographic value for strings": function(min) {
-      assert.equal(min(["c", "a", "b"]), "a");
-      assert.equal(min(["20", "3"]), "20");
-      assert.equal(min(["3", "20"]), "20");
-    },
-    "ignores null, undefined and NaN": function(min) {
-      var o = {valueOf: function() { return NaN; }};
-      assert.equal(min([NaN, 1, 2, 3, 4, 5]), 1);
-      assert.equal(min([o, 1, 2, 3, 4, 5]), 1);
-      assert.equal(min([1, 2, 3, 4, 5, NaN]), 1);
-      assert.equal(min([1, 2, 3, 4, 5, o]), 1);
-      assert.equal(min([10, null, 3, undefined, 5, NaN]), 3);
-      assert.equal(min([-1, null, -3, undefined, -5, NaN]), -5);
-    },
-    "compares heterogenous types as numbers": function(min) {
-      assert.strictEqual(min([20, "3"]), "3");
-      assert.strictEqual(min(["20", 3]), 3);
-      assert.strictEqual(min([3, "20"]), 3);
-      assert.strictEqual(min(["3", 20]), "3");
-    },
-    "returns undefined for empty array": function(min) {
-      assert.isUndefined(min([]));
-      assert.isUndefined(min([null]));
-      assert.isUndefined(min([undefined]));
-      assert.isUndefined(min([NaN]));
-      assert.isUndefined(min([NaN, NaN]));
-    },
-    "applies the optional accessor function": function(min) {
-      assert.equal(min([[1, 2, 3, 4, 5], [2, 4, 6, 8, 10]], function(d) { return _.max(d); }), 5);
-      assert.equal(min([1, 2, 3, 4, 5], function(d, i) { return i; }), 0);
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/format/format-test.js b/test/format/format-test.js
deleted file mode 100644
index b81704bcea725..0000000000000
--- a/test/format/format-test.js
+++ /dev/null
@@ -1,436 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert");
-
-var suite = vows.describe("d3.format");
-
-suite.addBatch({
-  "format": {
-    topic: load("format/format").expression("d3.format"),
-    "returns a string": function(format) {
-      assert.isString(format("d")(0));
-    },
-    "can zero fill": function(format) {
-      var f = format("08d");
-      assert.strictEqual(f(0), "00000000");
-      assert.strictEqual(f(42), "00000042");
-      assert.strictEqual(f(42000000), "42000000");
-      assert.strictEqual(f(420000000), "420000000");
-      assert.strictEqual(f(-4), "-0000004");
-      assert.strictEqual(f(-42), "-0000042");
-      assert.strictEqual(f(-4200000), "-4200000");
-      assert.strictEqual(f(-42000000), "-42000000");
-    },
-    "can space fill": function(format) {
-      var f = format("8d");
-      assert.strictEqual(f(0), "       0");
-      assert.strictEqual(f(42), "      42");
-      assert.strictEqual(f(42000000), "42000000");
-      assert.strictEqual(f(420000000), "420000000");
-      assert.strictEqual(f(-4), "      -4");
-      assert.strictEqual(f(-42), "     -42");
-      assert.strictEqual(f(-4200000), "-4200000");
-      assert.strictEqual(f(-42000000), "-42000000");
-    },
-    "can output fixed-point notation": function(format) {
-      assert.strictEqual(format(".1f")(0.49), "0.5");
-      assert.strictEqual(format(".2f")(0.449), "0.45");
-      assert.strictEqual(format(".3f")(0.4449), "0.445");
-      assert.strictEqual(format(".5f")(0.444449), "0.44445");
-      assert.strictEqual(format(".1f")(100), "100.0");
-      assert.strictEqual(format(".2f")(100), "100.00");
-      assert.strictEqual(format(".3f")(100), "100.000");
-      assert.strictEqual(format(".5f")(100), "100.00000");
-    },
-    "can output general notation": function(format) {
-      assert.strictEqual(format(".1g")(0.049), "0.05");
-      assert.strictEqual(format(".1g")(0.49), "0.5");
-      assert.strictEqual(format(".2g")(0.449), "0.45");
-      assert.strictEqual(format(".3g")(0.4449), "0.445");
-      assert.strictEqual(format(".5g")(0.444449), "0.44445");
-      assert.strictEqual(format(".1g")(100), "1e+2");
-      assert.strictEqual(format(".2g")(100), "1.0e+2");
-      assert.strictEqual(format(".3g")(100), "100");
-      assert.strictEqual(format(".5g")(100), "100.00");
-      assert.strictEqual(format(".5g")(100.2), "100.20");
-      assert.strictEqual(format(".2g")(0.002), "0.0020");
-    },
-    "can output exponent notation ": function(format) {
-      var f = format("e");
-      assert.strictEqual(f(0), "0e+0");
-      assert.strictEqual(f(42), "4.2e+1");
-      assert.strictEqual(f(42000000), "4.2e+7");
-      assert.strictEqual(f(420000000), "4.2e+8");
-      assert.strictEqual(f(-4), "-4e+0");
-      assert.strictEqual(f(-42), "-4.2e+1");
-      assert.strictEqual(f(-4200000), "-4.2e+6");
-      assert.strictEqual(f(-42000000), "-4.2e+7");
-      assert.strictEqual(format(".0e")(42), "4e+1")
-      assert.strictEqual(format(".3e")(42), "4.200e+1")
-    },
-    "can output SI prefix notation": function(format) {
-      var f = format("s");
-      assert.strictEqual(f(0), "0");
-      assert.strictEqual(f(1), "1");
-      assert.strictEqual(f(10), "10");
-      assert.strictEqual(f(100), "100");
-      assert.strictEqual(f(999.5), "999.5");
-      assert.strictEqual(f(999500), "999.5k");
-      assert.strictEqual(f(1000), "1k");
-      assert.strictEqual(f(1400), "1.4k");
-      assert.strictEqual(f(1500.5), "1.5005k");
-      assert.strictEqual(f(0.000001), "1µ");
-    },
-    "can output SI prefix notation with appropriate rounding": function(format) {
-      var f = format(".3s");
-      assert.strictEqual(f(0), "0.00");
-      assert.strictEqual(f(1), "1.00");
-      assert.strictEqual(f(10), "10.0");
-      assert.strictEqual(f(100), "100");
-      assert.strictEqual(f(999.5), "1.00k");
-      assert.strictEqual(f(999500), "1.00M");
-      assert.strictEqual(f(1000), "1.00k");
-      assert.strictEqual(f(1500.5), "1.50k");
-      assert.strictEqual(f(145500000), "146M");
-      assert.strictEqual(f(145999999.999999347), "146M");
-      assert.strictEqual(f(1e26), "100Y");
-      assert.strictEqual(f(0.000001), "1.00µ");
-      assert.strictEqual(f(0.009995), "10.0m");
-      var f = format(".4s");
-      assert.strictEqual(f(999.5), "999.5");
-      assert.strictEqual(f(999500), "999.5k");
-      assert.strictEqual(f(0.009995), "9.995m");
-    },
-    "can output SI prefix notation with appropriate rounding and currency symbol": function(format) {
-      var f = format("$.3s");
-      assert.strictEqual(f(0), "$0.00");
-      assert.strictEqual(f(1), "$1.00");
-      assert.strictEqual(f(10), "$10.0");
-      assert.strictEqual(f(100), "$100");
-      assert.strictEqual(f(999.5), "$1.00k");
-      assert.strictEqual(f(999500), "$1.00M");
-      assert.strictEqual(f(1000), "$1.00k");
-      assert.strictEqual(f(1500.5), "$1.50k");
-      assert.strictEqual(f(145500000), "$146M");
-      assert.strictEqual(f(145999999.999999347), "$146M");
-      assert.strictEqual(f(1e26), "$100Y");
-      assert.strictEqual(f(0.000001), "$1.00µ");
-      assert.strictEqual(f(0.009995), "$10.0m");
-      var f = format("$.4s");
-      assert.strictEqual(f(999.5), "$999.5");
-      assert.strictEqual(f(999500), "$999.5k");
-      assert.strictEqual(f(0.009995), "$9.995m");
-    },
-    "SI prefix notation precision is consistent for small and large numbers": function(format) {
-      assert.deepEqual(
-        [    1e-5,     1e-4,     1e-3,     1e-2,     1e-1,    1e-0,     1e1,     1e2,      1e3,      1e4,      1e5].map(format("s")),
-        [    '10µ',   '100µ',    '1m',    '10m',   '100m',     '1',    '10',    '100',    '1k',    '10k',   '100k']);
-      assert.deepEqual(
-        [    1e-5,     1e-4,     1e-3,     1e-2,     1e-1,    1e-0,     1e1,     1e2,      1e3,      1e4,      1e5].map(format(".4s")),
-        ['10.00µ', '100.0µ', '1.000m', '10.00m', '100.0m', '1.000', '10.00', '100.0', '1.000k', '10.00k', '100.0k']);
-    },
-    "can output a currency": function(format) {
-      var f = format("$");
-      assert.strictEqual(f(0), "$0");
-      assert.strictEqual(f(0.042), "$0.042");
-      assert.strictEqual(f(0.42), "$0.42");
-      assert.strictEqual(f(4.2), "$4.2");
-      assert.strictEqual(f(-0.042), "-$0.042");
-      assert.strictEqual(f(-0.42), "-$0.42");
-      assert.strictEqual(f(-4.2), "-$4.2");
-    },
-    "can output a currency with comma-grouping and sign": function(format) {
-      var f = format("+$,.2f");
-      assert.strictEqual(f(0), "+$0.00");
-      assert.strictEqual(f(0.429), "+$0.43");
-      assert.strictEqual(f(-0.429), "-$0.43");
-      assert.strictEqual(f(-1), "-$1.00");
-      assert.strictEqual(f(1e4), "+$10,000.00");
-    },
-    "can output a currency with si-prefix notation": function(format) {
-      var f = format("$.2s");
-      assert.strictEqual(f(0), "$0.0");
-      assert.strictEqual(f(2.5e5), "$250k");
-      assert.strictEqual(f(-2.5e8), "-$250M");
-      assert.strictEqual(f(2.5e11), "$250G");
-    },
-    "can output a percentage": function(format) {
-      var f = format("%");
-      assert.strictEqual(f(0), "0%");
-      assert.strictEqual(f(0.042), "4%");
-      assert.strictEqual(f(0.42), "42%");
-      assert.strictEqual(f(4.2), "420%");
-      assert.strictEqual(f(-0.042), "-4%");
-      assert.strictEqual(f(-0.42), "-42%");
-      assert.strictEqual(f(-4.2), "-420%");
-    },
-    "can output a percentage with rounding and sign": function(format) {
-      var f = format("+.2p");
-      assert.strictEqual(f(0.00123), "+0.12%");
-      assert.strictEqual(f(0.0123), "+1.2%");
-      assert.strictEqual(f(0.123), "+12%");
-      assert.strictEqual(f(1.23), "+120%");
-      assert.strictEqual(f(-0.00123), "-0.12%");
-      assert.strictEqual(f(-0.0123), "-1.2%");
-      assert.strictEqual(f(-0.123), "-12%");
-      assert.strictEqual(f(-1.23), "-120%");
-    },
-    "can round to significant digits": function(format) {
-      assert.strictEqual(format(".2r")(0), "0.0");
-      assert.strictEqual(format(".1r")(0.049), "0.05");
-      assert.strictEqual(format(".1r")(-0.049), "-0.05");
-      assert.strictEqual(format(".1r")(0.49), "0.5");
-      assert.strictEqual(format(".1r")(-0.49), "-0.5");
-      assert.strictEqual(format(".2r")(0.449), "0.45");
-      assert.strictEqual(format(".3r")(0.4449), "0.445");
-      assert.strictEqual(format(".3r")(1.00), "1.00");
-      assert.strictEqual(format(".3r")(0.9995), "1.00");
-      assert.strictEqual(format(".5r")(0.444449), "0.44445");
-      assert.strictEqual(format("r")(123.45), "123.45");
-      assert.strictEqual(format(".1r")(123.45), "100");
-      assert.strictEqual(format(".2r")(123.45), "120");
-      assert.strictEqual(format(".3r")(123.45), "123");
-      assert.strictEqual(format(".4r")(123.45), "123.5");
-      assert.strictEqual(format(".5r")(123.45), "123.45");
-      assert.strictEqual(format(".6r")(123.45), "123.450");
-      assert.strictEqual(format(".1r")(0.9), "0.9");
-      assert.strictEqual(format(".1r")(0.09), "0.09");
-      assert.strictEqual(format(".1r")(0.949), "0.9");
-      assert.strictEqual(format(".1r")(0.0949), "0.09");
-      assert.strictEqual(format(".10r")(0.9999999999), "0.9999999999");
-      assert.strictEqual(format(".15r")(0.999999999999999), "0.999999999999999");
-    },
-    "can round very small numbers": function(format) {
-      var f = format(".2r");
-      assert.strictEqual(f(1e-22), "0.00000000000000000000");
-    },
-    "can group thousands": function(format) {
-      var f = format(",d");
-      assert.strictEqual(f(0), "0");
-      assert.strictEqual(f(42), "42");
-      assert.strictEqual(f(42000000), "42,000,000");
-      assert.strictEqual(f(420000000), "420,000,000");
-      assert.strictEqual(f(-4), "-4");
-      assert.strictEqual(f(-42), "-42");
-      assert.strictEqual(f(-4200000), "-4,200,000");
-      assert.strictEqual(f(-42000000), "-42,000,000");
-      assert.strictEqual(f(1e21), "1e+21");
-    },
-    "can group thousands and zero fill": function(format) {
-      assert.strictEqual(format("01,d")(0), "0");
-      assert.strictEqual(format("01,d")(0), "0");
-      assert.strictEqual(format("02,d")(0), "00");
-      assert.strictEqual(format("03,d")(0), "000");
-      assert.strictEqual(format("04,d")(0), "0,000");
-      assert.strictEqual(format("05,d")(0), "0,000");
-      assert.strictEqual(format("06,d")(0), "00,000");
-      assert.strictEqual(format("08,d")(0), "0,000,000");
-      assert.strictEqual(format("013,d")(0), "0,000,000,000");
-      assert.strictEqual(format("021,d")(0), "0,000,000,000,000,000");
-      assert.strictEqual(format("013,d")(-42000000), "-0,042,000,000");
-      assert.strictEqual(format("012,d")(1e21), "0,000,001e+21");
-      assert.strictEqual(format("013,d")(1e21), "0,000,001e+21");
-      assert.strictEqual(format("014,d")(1e21), "00,000,001e+21");
-      assert.strictEqual(format("015,d")(1e21), "000,000,001e+21");
-    },
-    "can group thousands and zero fill with overflow": function(format) {
-      assert.strictEqual(format("01,d")(1), "1");
-      assert.strictEqual(format("01,d")(1), "1");
-      assert.strictEqual(format("02,d")(12), "12");
-      assert.strictEqual(format("03,d")(123), "123");
-      assert.strictEqual(format("05,d")(12345), "12,345");
-      assert.strictEqual(format("08,d")(12345678), "12,345,678");
-      assert.strictEqual(format("013,d")(1234567890123), "1,234,567,890,123");
-    },
-    "can group thousands and space fill": function(format) {
-      assert.strictEqual(format("1,d")(0), "0");
-      assert.strictEqual(format("1,d")(0), "0");
-      assert.strictEqual(format("2,d")(0), " 0");
-      assert.strictEqual(format("3,d")(0), "  0");
-      assert.strictEqual(format("5,d")(0), "    0");
-      assert.strictEqual(format("8,d")(0), "       0");
-      assert.strictEqual(format("13,d")(0), "            0");
-      assert.strictEqual(format("21,d")(0), "                    0");
-    },
-    "can group thousands and space fill with overflow": function(format) {
-      assert.strictEqual(format("1,d")(1), "1");
-      assert.strictEqual(format("1,d")(1), "1");
-      assert.strictEqual(format("2,d")(12), "12");
-      assert.strictEqual(format("3,d")(123), "123");
-      assert.strictEqual(format("5,d")(12345), "12,345");
-      assert.strictEqual(format("8,d")(12345678), "12,345,678");
-      assert.strictEqual(format("13,d")(1234567890123), "1,234,567,890,123");
-    },
-    "can group thousands with general notation": function(format) {
-      var f = format(",g");
-      assert.strictEqual(f(0), "0");
-      assert.strictEqual(f(42), "42");
-      assert.strictEqual(f(42000000), "42,000,000");
-      assert.strictEqual(f(420000000), "420,000,000");
-      assert.strictEqual(f(-4), "-4");
-      assert.strictEqual(f(-42), "-42");
-      assert.strictEqual(f(-4200000), "-4,200,000");
-      assert.strictEqual(f(-42000000), "-42,000,000");
-    },
-    "can group thousands, space fill, and round to significant digits": function(format) {
-      assert.strictEqual(format("10,.1f")(123456.49), " 123,456.5");
-      assert.strictEqual(format("10,.2f")(1234567.449), "1,234,567.45");
-      assert.strictEqual(format("10,.3f")(12345678.4449), "12,345,678.445");
-      assert.strictEqual(format("10,.5f")(123456789.444449), "123,456,789.44445");
-      assert.strictEqual(format("10,.1f")(123456), " 123,456.0");
-      assert.strictEqual(format("10,.2f")(1234567), "1,234,567.00");
-      assert.strictEqual(format("10,.3f")(12345678), "12,345,678.000");
-      assert.strictEqual(format("10,.5f")(123456789), "123,456,789.00000");
-    },
-    "can display integers in fixed-point notation": function(format) {
-      assert.strictEqual(format("f")(42), "42");
-    },
-    "will not display non-integers in integer format": function(format) {
-      assert.strictEqual(format("d")(4.2), "");
-    },
-    "unicode character": function(format) {
-      assert.strictEqual(format("c")(9731), "☃");
-    },
-    "binary": function(format) {
-      assert.strictEqual(format("b")(10), "1010");
-    },
-    "binary with prefix": function(format) {
-      assert.strictEqual(format("#b")(10), "0b1010");
-    },
-    "octal": function(format) {
-      assert.strictEqual(format("o")(10), "12");
-    },
-    "octal with prefix": function(format) {
-      assert.strictEqual(format("#o")(10), "0o12");
-    },
-    "hexadecimal (lowercase)": function(format) {
-      assert.strictEqual(format("x")(3735928559), "deadbeef");
-    },
-    "hexadecimal (lowercase) with prefix": function(format) {
-      assert.strictEqual(format("#x")(3735928559), "0xdeadbeef");
-    },
-    "hexadecimal (uppercase)": function(format) {
-      assert.strictEqual(format("X")(3735928559), "DEADBEEF");
-    },
-    "hexadecimal (uppercase) with prefix": function(format) {
-      assert.strictEqual(format("#X")(3735928559), "0xDEADBEEF");
-    },
-    "fill respects prefix": function(format) {
-      assert.strictEqual(format("#20x")(3735928559), "          0xdeadbeef");
-    },
-    "align left": function(format) {
-      assert.strictEqual(format("<1,d")(0), "0");
-      assert.strictEqual(format("<1,d")(0), "0");
-      assert.strictEqual(format("<2,d")(0), "0 ");
-      assert.strictEqual(format("<3,d")(0), "0  ");
-      assert.strictEqual(format("<5,d")(0), "0    ");
-      assert.strictEqual(format("<8,d")(0), "0       ");
-      assert.strictEqual(format("<13,d")(0), "0            ");
-      assert.strictEqual(format("<21,d")(0), "0                    ");
-    },
-    "align right": function(format) {
-      assert.strictEqual(format(">1,d")(0), "0");
-      assert.strictEqual(format(">1,d")(0), "0");
-      assert.strictEqual(format(">2,d")(0), " 0");
-      assert.strictEqual(format(">3,d")(0), "  0");
-      assert.strictEqual(format(">5,d")(0), "    0");
-      assert.strictEqual(format(">8,d")(0), "       0");
-      assert.strictEqual(format(">13,d")(0), "            0");
-      assert.strictEqual(format(">21,d")(0), "                    0");
-      assert.strictEqual(format(">21,d")(1000), "                1,000");
-      assert.strictEqual(format(">21,d")(1e21), "                1e+21");
-    },
-    "align center": function(format) {
-      assert.strictEqual(format("^1,d")(0), "0");
-      assert.strictEqual(format("^1,d")(0), "0");
-      assert.strictEqual(format("^2,d")(0), " 0");
-      assert.strictEqual(format("^3,d")(0), " 0 ");
-      assert.strictEqual(format("^5,d")(0), "  0  ");
-      assert.strictEqual(format("^8,d")(0), "    0   ");
-      assert.strictEqual(format("^13,d")(0), "      0      ");
-      assert.strictEqual(format("^21,d")(0), "          0          ");
-      assert.strictEqual(format("^21,d")(1000), "        1,000        ");
-      assert.strictEqual(format("^21,d")(1e21), "        1e+21        ");
-    },
-    "pad after sign": function(format) {
-      assert.strictEqual(format("=+1,d")(0), "+0");
-      assert.strictEqual(format("=+1,d")(0), "+0");
-      assert.strictEqual(format("=+2,d")(0), "+0");
-      assert.strictEqual(format("=+3,d")(0), "+ 0");
-      assert.strictEqual(format("=+5,d")(0), "+   0");
-      assert.strictEqual(format("=+8,d")(0), "+      0");
-      assert.strictEqual(format("=+13,d")(0), "+           0");
-      assert.strictEqual(format("=+21,d")(0), "+                   0");
-      assert.strictEqual(format("=+21,d")(1e21), "+               1e+21");
-    },
-    "pad after sign with currency": function(format) {
-      assert.strictEqual(format("=+$1,d")(0), "+$0");
-      assert.strictEqual(format("=+$1,d")(0), "+$0");
-      assert.strictEqual(format("=+$2,d")(0), "+$0");
-      assert.strictEqual(format("=+$3,d")(0), "+$0");
-      assert.strictEqual(format("=+$5,d")(0), "+$  0");
-      assert.strictEqual(format("=+$8,d")(0), "+$     0");
-      assert.strictEqual(format("=+$13,d")(0), "+$          0");
-      assert.strictEqual(format("=+$21,d")(0), "+$                  0");
-      assert.strictEqual(format("=+$21,d")(1e21), "+$              1e+21");
-    },
-    "a space can denote positive numbers": function(format) {
-      assert.strictEqual(format(" 1,d")(-1), "-1");
-      assert.strictEqual(format(" 1,d")(0), " 0");
-      assert.strictEqual(format(" 2,d")(0), " 0");
-      assert.strictEqual(format(" 3,d")(0), "  0");
-      assert.strictEqual(format(" 5,d")(0), "    0");
-      assert.strictEqual(format(" 8,d")(0), "       0");
-      assert.strictEqual(format(" 13,d")(0), "            0");
-      assert.strictEqual(format(" 21,d")(0), "                    0");
-      assert.strictEqual(format(" 21,d")(1e21), "                1e+21");
-    },
-    "explicitly only use a sign for negative numbers": function(format) {
-      assert.strictEqual(format("-1,d")(-1), "-1");
-      assert.strictEqual(format("-1,d")(0), "0");
-      assert.strictEqual(format("-2,d")(0), " 0");
-      assert.strictEqual(format("-3,d")(0), "  0");
-      assert.strictEqual(format("-5,d")(0), "    0");
-      assert.strictEqual(format("-8,d")(0), "       0");
-      assert.strictEqual(format("-13,d")(0), "            0");
-      assert.strictEqual(format("-21,d")(0), "                    0");
-    },
-    "can format negative zero": function(format) {
-      assert.strictEqual(format("1d")(-0), "-0");
-      assert.strictEqual(format("1f")(-0), "-0");
-    },
-    "supports \"n\" as an alias for \",g\"": function(format) {
-      var f = format("n");
-      assert.strictEqual(f(0.0042), "0.0042");
-      assert.strictEqual(f(0.42), "0.42");
-      assert.strictEqual(f(0), "0");
-      assert.strictEqual(f(42), "42");
-      assert.strictEqual(f(42000000), "42,000,000");
-      assert.strictEqual(f(420000000), "420,000,000");
-      assert.strictEqual(f(-4), "-4");
-      assert.strictEqual(f(-42), "-42");
-      assert.strictEqual(f(-4200000), "-4,200,000");
-      assert.strictEqual(f(-42000000), "-42,000,000");
-      assert.strictEqual(f(1e21), "1e+21");
-    },
-    "\"n\" with zero padding": function(format) {
-      assert.strictEqual(format("01n")(0), "0");
-      assert.strictEqual(format("01n")(0), "0");
-      assert.strictEqual(format("02n")(0), "00");
-      assert.strictEqual(format("03n")(0), "000");
-      assert.strictEqual(format("05n")(0), "0,000");
-      assert.strictEqual(format("08n")(0), "0,000,000");
-      assert.strictEqual(format("013n")(0), "0,000,000,000");
-      assert.strictEqual(format("021n")(0), "0,000,000,000,000,000");
-      assert.strictEqual(format("013n")(-42000000), "-0,042,000,000");
-    },
-    "unreasonable precision values are clamped to reasonable values": function(format) {
-      assert.strictEqual(format(".30f")(0), "0.00000000000000000000");
-      assert.strictEqual(format(".0g")(1), "1");
-      assert.strictEqual(format(",.-1f")(12345), "12,345");
-      assert.strictEqual(format("+,.-1%")(123.45), "+12,345%");
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/format/formatPrefix-test.js b/test/format/formatPrefix-test.js
deleted file mode 100644
index dd9e37a7507bd..0000000000000
--- a/test/format/formatPrefix-test.js
+++ /dev/null
@@ -1,115 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert");
-
-var suite = vows.describe("d3.formatPrefix");
-
-suite.addBatch({
-  "formatPrefix": {
-    topic: load("format/formatPrefix").expression("d3.formatPrefix"),
-    "determines the appropriate prefix for small numbers": function(prefix) {
-      assert.equal(prefix(0).symbol, "");
-      assert.equal(prefix(1e-00).symbol, "");
-      assert.equal(prefix(1e-01).symbol, "m");
-      assert.equal(prefix(1e-02).symbol, "m");
-      assert.equal(prefix(1e-03).symbol, "m");
-      assert.equal(prefix(1e-04).symbol, "µ");
-      assert.equal(prefix(1e-05).symbol, "µ");
-      assert.equal(prefix(1e-06).symbol, "µ");
-      assert.equal(prefix(1e-07).symbol, "n");
-      assert.equal(prefix(1e-08).symbol, "n");
-      assert.equal(prefix(1e-09).symbol, "n");
-      assert.equal(prefix(1e-10).symbol, "p");
-      assert.equal(prefix(1e-11).symbol, "p");
-      assert.equal(prefix(1e-12).symbol, "p");
-      assert.equal(prefix(1e-13).symbol, "f");
-      assert.equal(prefix(1e-14).symbol, "f");
-      assert.equal(prefix(1e-15).symbol, "f");
-      assert.equal(prefix(1e-16).symbol, "a");
-      assert.equal(prefix(1e-17).symbol, "a");
-      assert.equal(prefix(1e-18).symbol, "a");
-      assert.equal(prefix(1e-19).symbol, "z");
-      assert.equal(prefix(1e-20).symbol, "z");
-      assert.equal(prefix(1e-21).symbol, "z");
-      assert.equal(prefix(1e-22).symbol, "y");
-      assert.equal(prefix(1e-23).symbol, "y");
-      assert.equal(prefix(1e-24).symbol, "y");
-      assert.equal(prefix(1e-25).symbol, "y");
-      assert.equal(prefix(1e-26).symbol, "y");
-      assert.equal(prefix(1e-27).symbol, "y");
-    },
-    "determines the appropriate prefix for large numbers": function(prefix) {
-      assert.equal(prefix(0).symbol, "");
-      assert.equal(prefix(1e00).symbol, "");
-      assert.equal(prefix(1e01).symbol, "");
-      assert.equal(prefix(1e02).symbol, "");
-      assert.equal(prefix(1e03).symbol, "k");
-      assert.equal(prefix(1e04).symbol, "k");
-      assert.equal(prefix(1e05).symbol, "k");
-      assert.equal(prefix(1e06).symbol, "M");
-      assert.equal(prefix(1e07).symbol, "M");
-      assert.equal(prefix(1e08).symbol, "M");
-      assert.equal(prefix(1e09).symbol, "G");
-      assert.equal(prefix(1e10).symbol, "G");
-      assert.equal(prefix(1e11).symbol, "G");
-      assert.equal(prefix(1e12).symbol, "T");
-      assert.equal(prefix(1e13).symbol, "T");
-      assert.equal(prefix(1e14).symbol, "T");
-      assert.equal(prefix(1e15).symbol, "P");
-      assert.equal(prefix(1e16).symbol, "P");
-      assert.equal(prefix(1e17).symbol, "P");
-      assert.equal(prefix(1e18).symbol, "E");
-      assert.equal(prefix(1e19).symbol, "E");
-      assert.equal(prefix(1e20).symbol, "E");
-      assert.equal(prefix(1e21).symbol, "Z");
-      assert.equal(prefix(1e22).symbol, "Z");
-      assert.equal(prefix(1e23).symbol, "Z");
-      assert.equal(prefix(1e24).symbol, "Y");
-      assert.equal(prefix(1e25).symbol, "Y");
-      assert.equal(prefix(1e26).symbol, "Y");
-      assert.equal(prefix(1e27).symbol, "Y");
-    },
-    "determines the appropriate prefix for negative numbers": function(prefix) {
-      assert.equal(prefix(-0).symbol, "");
-      assert.equal(prefix(-1e-00).symbol, "");
-      assert.equal(prefix(-1e-03).symbol, "m");
-      assert.equal(prefix(-1e-06).symbol, "µ");
-      assert.equal(prefix(-1e-09).symbol, "n");
-      assert.equal(prefix(-1e-12).symbol, "p");
-      assert.equal(prefix(-1e-15).symbol, "f");
-      assert.equal(prefix(-1e-18).symbol, "a");
-      assert.equal(prefix(-1e-21).symbol, "z");
-      assert.equal(prefix(-1e-24).symbol, "y");
-      assert.equal(prefix(-1e-27).symbol, "y");
-      assert.equal(prefix(-1e00).symbol, "");
-      assert.equal(prefix(-1e03).symbol, "k");
-      assert.equal(prefix(-1e06).symbol, "M");
-      assert.equal(prefix(-1e09).symbol, "G");
-      assert.equal(prefix(-1e12).symbol, "T");
-      assert.equal(prefix(-1e15).symbol, "P");
-      assert.equal(prefix(-1e18).symbol, "E");
-      assert.equal(prefix(-1e21).symbol, "Z");
-      assert.equal(prefix(-1e24).symbol, "Y");
-      assert.equal(prefix(-1e27).symbol, "Y");
-    },
-    "considers the effect of rounding based on precision": function(prefix) {
-      assert.equal(prefix(999.50000, 4).symbol, "");
-      assert.equal(prefix(999.50000, 3).symbol, "k");
-      assert.equal(prefix(995.00000, 3).symbol, "");
-      assert.equal(prefix(995.00000, 2).symbol, "k");
-      assert.equal(prefix(950.00000, 2).symbol, "");
-      assert.equal(prefix(950.00000, 1).symbol, "k");
-      assert.equal(prefix(0.0009995, 4).symbol, "µ");
-      assert.equal(prefix(0.0009995, 3).symbol, "m");
-      assert.equal(prefix(0.0009950, 3).symbol, "µ");
-      assert.equal(prefix(0.0009950, 2).symbol, "m");
-      assert.equal(prefix(0.0009500, 2).symbol, "µ");
-      assert.equal(prefix(0.0009500, 1).symbol, "m");
-    },
-    "coerces input to a string": function(prefix) {
-      assert.equal(prefix("0").symbol, "");
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/format/requote-test.js b/test/format/requote-test.js
deleted file mode 100644
index 4c727f98c54c4..0000000000000
--- a/test/format/requote-test.js
+++ /dev/null
@@ -1,49 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert");
-
-var suite = vows.describe("d3.requote");
-
-suite.addBatch({
-  "requote": {
-    topic: load("format/requote").expression("d3.requote"),
-    "quotes backslashes": function(requote) {
-      assert.equal(requote("\\"), "\\\\");
-    },
-    "quotes carets": function(requote) {
-      assert.equal(requote("^"), "\\^");
-    },
-    "quotes dollar signs": function(requote) {
-      assert.equal(requote("$"), "\\$");
-    },
-    "quotes stars": function(requote) {
-      assert.equal(requote("*"), "\\*");
-    },
-    "quotes plusses": function(requote) {
-      assert.equal(requote("+"), "\\+");
-    },
-    "quotes question marks": function(requote) {
-      assert.equal(requote("?"), "\\?");
-    },
-    "quotes periods": function(requote) {
-      assert.equal(requote("."), "\\.");
-    },
-    "quotes parentheses": function(requote) {
-      assert.equal(requote("("), "\\(");
-      assert.equal(requote(")"), "\\)");
-    },
-    "quotes pipes": function(requote) {
-      assert.equal(requote("|"), "\\|");
-    },
-    "quotes curly braces": function(requote) {
-      assert.equal(requote("{"), "\\{");
-      assert.equal(requote("}"), "\\}");
-    },
-    "quotes square brackets": function(requote) {
-      assert.equal(requote("["), "\\[");
-      assert.equal(requote("]"), "\\]");
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/format/round-test.js b/test/format/round-test.js
deleted file mode 100644
index 0f70c48d0a23c..0000000000000
--- a/test/format/round-test.js
+++ /dev/null
@@ -1,66 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert");
-
-var suite = vows.describe("d3.round");
-
-suite.addBatch({
-  "round": {
-    topic: load("format/round").expression("d3.round"),
-    "returns a number": function(round) {
-      assert.isNumber(round(42));
-    },
-    "returns zero for zero": function(round) {
-      assert.equal(round(0), 0);
-    },
-    "ignores degenerate input": function(round) {
-      assert.isNaN(round(NaN));
-      assert.equal(round(Infinity), Infinity);
-      assert.equal(round(-Infinity), -Infinity);
-    },
-    "returns integers by default": function(round) {
-      assert.equal(round(10.6), 11);
-      assert.equal(round(10.4), 10);
-      assert.equal(round(0.6), 1);
-      assert.equal(round(0.4), 0);
-      assert.equal(round(-0.6), -1);
-      assert.equal(round(-0.4), 0);
-      assert.equal(round(-10.6), -11);
-      assert.equal(round(-10.4), -10);
-    },
-    "rounds to the specified decimal place": function(round) {
-      assert.inDelta(round(10.56, 1), 10.6, 1e-6);
-      assert.inDelta(round(10.54, 1), 10.5, 1e-6);
-      assert.inDelta(round(0.56, 1), 0.6, 1e-6);
-      assert.inDelta(round(0.54, 1), 0.5, 1e-6);
-      assert.inDelta(round(-0.56, 1), -0.6, 1e-6);
-      assert.inDelta(round(-0.54, 1), -0.5, 1e-6);
-      assert.inDelta(round(-10.56, 1), -10.6, 1e-6);
-      assert.inDelta(round(-10.54, 1), -10.5, 1e-6);
-      assert.inDelta(round(10.556, 2), 10.56, 1e-6);
-      assert.inDelta(round(10.554, 2), 10.55, 1e-6);
-      assert.inDelta(round(0.556, 2), 0.56, 1e-6);
-      assert.inDelta(round(0.554, 2), 0.55, 1e-6);
-      assert.inDelta(round(-0.556, 2), -0.56, 1e-6);
-      assert.inDelta(round(-0.554, 2), -0.55, 1e-6);
-      assert.inDelta(round(-10.556, 2), -10.56, 1e-6);
-      assert.inDelta(round(-10.554, 2), -10.55, 1e-6);
-    },
-    "rounds to the specified significant digits": function(round) {
-      assert.equal(round(123.45, -1), 120);
-      assert.equal(round(345.67, -1), 350);
-      assert.equal(round(-123.45, -1), -120);
-      assert.equal(round(-345.67, -1), -350);
-      assert.equal(round(123.45, -2), 100);
-      assert.equal(round(456.78, -2), 500);
-      assert.equal(round(-123.45, -2), -100);
-      assert.equal(round(-456.78, -2), -500);
-      assert.equal(round(123.45, -3), 0);
-      assert.equal(round(567.89, -3), 1000);
-      assert.equal(round(-123.45, -3), 0);
-      assert.equal(round(-567.89, -3), -1000);
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/interpolate/interpolate-string-benchmark b/test/interpolate/interpolate-string-benchmark
index e8babf9b94334..7540e30c8851b 100755
--- a/test/interpolate/interpolate-string-benchmark
+++ b/test/interpolate/interpolate-string-benchmark
@@ -6,9 +6,6 @@ var n = +process.argv[2],
     p = +process.argv[3],
     k = +process.argv[4];
 
-var formatTime = d3.format(".3s"),
-    formatNumber = d3.format(",.0f");
-
 // Returns the time required to construct a string interpolator
 // for two strings with n numbers, separated by commas,
 // with probability p that the corresponding numbers in a & b are different.
@@ -28,4 +25,4 @@ function observeConstruction(n, p, k) {
   return sum / k;
 }
 
-console.log(formatTime(observeConstruction(n, p, k)) + "s\tn=" + formatNumber(n) + "\tp=" + p);
+console.log(observeConstruction(n, p, k) + "s\tn=" + n + "\tp=" + p);
diff --git a/test/locale/locale-caes-test.js b/test/locale/locale-caes-test.js
deleted file mode 100644
index db5901eb44def..0000000000000
--- a/test/locale/locale-caes-test.js
+++ /dev/null
@@ -1,120 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("../time/time"),
-    local = time.local;
-
-var suite = vows.describe("d3.locale");
-
-suite.addBatch({
-  "locale": {
-    topic: load("locale/ca-ES").expression("d3_locale_caES"),
-
-    "numberFormat": {
-      topic: function(locale) {
-        return locale.numberFormat;
-      },
-      "formats numbers": function(format) {
-        var f = format(",.2f");
-        assert.equal(f(12345.67), "12.345,67");
-      },
-      "formats currencies": function(format) {
-        var f = format("$,.2f");
-        assert.equal(f(12345.67), "12.345,67 €");
-      },
-      "formats currencies with SI-prefix notation and currency suffix": function(format) {
-        var f = format("$,.4s");
-        assert.equal(f(12345.67), "12,35k €");
-      }
-    },
-
-    "timeFormat": {
-      topic: function(locale) {
-        return locale.timeFormat;
-      },
-
-      "format": {
-        "formats locale date and time": function(format) {
-          var f = format("%c");
-          assert.equal(f(local(1990, 0, 1)), "dilluns,  1 de gener de 1990, 00:00:00");
-        },
-        "formats locale date": function(format) {
-          var f = format("%x");
-          assert.equal(f(local(1990, 0, 1)), "01/01/1990");
-        },
-        "formats locale time": function(format) {
-          var f = format("%X");
-          assert.equal(f(local(1990, 0, 1)), "00:00:00");
-        },
-        "formats abbreviated weekday": function(format) {
-          var f = format("%a");
-          assert.equal(f(local(1990, 0, 1)), "dl.");
-          assert.equal(f(local(1990, 0, 2)), "dt.");
-          assert.equal(f(local(1990, 0, 3)), "dc.");
-          assert.equal(f(local(1990, 0, 4)), "dj.");
-          assert.equal(f(local(1990, 0, 5)), "dv.");
-          assert.equal(f(local(1990, 0, 6)), "ds.");
-          assert.equal(f(local(1990, 0, 7)), "dg.");
-        },
-        "formats weekday": function(format) {
-          var f = format("%A");
-          assert.equal(f(local(1990, 0, 1)), "dilluns");
-          assert.equal(f(local(1990, 0, 2)), "dimarts");
-          assert.equal(f(local(1990, 0, 3)), "dimecres");
-          assert.equal(f(local(1990, 0, 4)), "dijous");
-          assert.equal(f(local(1990, 0, 5)), "divendres");
-          assert.equal(f(local(1990, 0, 6)), "dissabte");
-          assert.equal(f(local(1990, 0, 7)), "diumenge");
-        },
-        "formats abbreviated month": function(format) {
-          var f = format("%b");
-          assert.equal(f(local(1990, 0, 1)), "gen.");
-          assert.equal(f(local(1990, 1, 1)), "febr.");
-          assert.equal(f(local(1990, 2, 1)), "març");
-          assert.equal(f(local(1990, 3, 1)), "abr.");
-          assert.equal(f(local(1990, 4, 1)), "maig");
-          assert.equal(f(local(1990, 5, 1)), "juny");
-          assert.equal(f(local(1990, 6, 1)), "jul.");
-          assert.equal(f(local(1990, 7, 1)), "ag.");
-          assert.equal(f(local(1990, 8, 1)), "set.");
-          assert.equal(f(local(1990, 9, 1)), "oct.");
-          assert.equal(f(local(1990, 10, 1)), "nov.");
-          assert.equal(f(local(1990, 11, 1)), "des.");
-        },
-        "formats month": function(format) {
-          var f = format("%B");
-          assert.equal(f(local(1990, 0, 1)), "gener");
-          assert.equal(f(local(1990, 1, 1)), "febrer");
-          assert.equal(f(local(1990, 2, 1)), "març");
-          assert.equal(f(local(1990, 3, 1)), "abril");
-          assert.equal(f(local(1990, 4, 1)), "maig");
-          assert.equal(f(local(1990, 5, 1)), "juny");
-          assert.equal(f(local(1990, 6, 1)), "juliol");
-          assert.equal(f(local(1990, 7, 1)), "agost");
-          assert.equal(f(local(1990, 8, 1)), "setembre");
-          assert.equal(f(local(1990, 9, 1)), "octubre");
-          assert.equal(f(local(1990, 10, 1)), "novembre");
-          assert.equal(f(local(1990, 11, 1)), "desembre");
-        },
-        "formats AM or PM": function(format) {
-          var f = format("%p");
-          assert.equal(f(local(1990, 0, 1, 0)), "AM");
-          assert.equal(f(local(1990, 0, 1, 13)), "PM");
-        }
-      },
-
-      "parse": {
-        "parses locale date and time": function(format) {
-          var p = format("%c").parse;
-          assert.deepEqual(p("dilluns, 1 de gener de 1990, 00:00:00"), local(1990, 0, 1));
-        },
-        "parses locale date": function(format) {
-          var p = format("%x").parse;
-          assert.deepEqual(p("01/01/1990"), local(1990, 0, 1));
-        }
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/locale/locale-fifi-test.js b/test/locale/locale-fifi-test.js
deleted file mode 100644
index 5a64ac46d28e1..0000000000000
--- a/test/locale/locale-fifi-test.js
+++ /dev/null
@@ -1,120 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("../time/time"),
-    local = time.local;
-
-var suite = vows.describe("d3.locale");
-
-suite.addBatch({
-  "locale": {
-    topic: load("locale/fi-FI").expression("d3_locale_fiFI"),
-
-    "numberFormat": {
-      topic: function(locale) {
-        return locale.numberFormat;
-      },
-      "formats numbers": function(format) {
-        var f = format(",.2f");
-        assert.equal(f(12345.67), "12\xa0345,67");
-      },
-      "formats currencies": function(format) {
-        var f = format("$,.2f");
-        assert.equal(f(12345.67), "12\xa0345,67\xa0€");
-      },
-      "formats currencies with SI-prefix notation and currency suffix": function(format) {
-        var f = format("$,.4s");
-        assert.equal(f(12345.67), "12,35k\xa0€");
-      }
-    },
-
-    "timeFormat": {
-      topic: function(locale) {
-        return locale.timeFormat;
-      },
-
-      "format": {
-        "formats locale date and time": function(format) {
-          var f = format("%c");
-          assert.equal(f(local(1990, 0, 1)), "maanantai, 1. tammikuuta 1990 klo 00:00:00");
-        },
-        "formats locale date": function(format) {
-          var f = format("%x");
-          assert.equal(f(local(1990, 0, 1)), "1.1.1990");
-        },
-        "formats locale time": function(format) {
-          var f = format("%X");
-          assert.equal(f(local(1990, 0, 1)), "00:00:00");
-        },
-        "formats abbreviated weekday": function(format) {
-          var f = format("%a");
-          assert.equal(f(local(1990, 0, 1)), "Ma");
-          assert.equal(f(local(1990, 0, 2)), "Ti");
-          assert.equal(f(local(1990, 0, 3)), "Ke");
-          assert.equal(f(local(1990, 0, 4)), "To");
-          assert.equal(f(local(1990, 0, 5)), "Pe");
-          assert.equal(f(local(1990, 0, 6)), "La");
-          assert.equal(f(local(1990, 0, 7)), "Su");
-        },
-        "formats weekday": function(format) {
-          var f = format("%A");
-          assert.equal(f(local(1990, 0, 1)), "maanantai");
-          assert.equal(f(local(1990, 0, 2)), "tiistai");
-          assert.equal(f(local(1990, 0, 3)), "keskiviikko");
-          assert.equal(f(local(1990, 0, 4)), "torstai");
-          assert.equal(f(local(1990, 0, 5)), "perjantai");
-          assert.equal(f(local(1990, 0, 6)), "lauantai");
-          assert.equal(f(local(1990, 0, 7)), "sunnuntai");
-        },
-        "formats abbreviated month": function(format) {
-          var f = format("%b");
-          assert.equal(f(local(1990, 0, 1)), "Tammi");
-          assert.equal(f(local(1990, 1, 1)), "Helmi");
-          assert.equal(f(local(1990, 2, 1)), "Maalis");
-          assert.equal(f(local(1990, 3, 1)), "Huhti");
-          assert.equal(f(local(1990, 4, 1)), "Touko");
-          assert.equal(f(local(1990, 5, 1)), "Kesä");
-          assert.equal(f(local(1990, 6, 1)), "Heinä");
-          assert.equal(f(local(1990, 7, 1)), "Elo");
-          assert.equal(f(local(1990, 8, 1)), "Syys");
-          assert.equal(f(local(1990, 9, 1)), "Loka");
-          assert.equal(f(local(1990, 10, 1)), "Marras");
-          assert.equal(f(local(1990, 11, 1)), "Joulu");
-        },
-        "formats month": function(format) {
-          var f = format("%B");
-          assert.equal(f(local(1990, 0, 1)), "tammikuu");
-          assert.equal(f(local(1990, 1, 1)), "helmikuu");
-          assert.equal(f(local(1990, 2, 1)), "maaliskuu");
-          assert.equal(f(local(1990, 3, 1)), "huhtikuu");
-          assert.equal(f(local(1990, 4, 1)), "toukokuu");
-          assert.equal(f(local(1990, 5, 1)), "kesäkuu");
-          assert.equal(f(local(1990, 6, 1)), "heinäkuu");
-          assert.equal(f(local(1990, 7, 1)), "elokuu");
-          assert.equal(f(local(1990, 8, 1)), "syyskuu");
-          assert.equal(f(local(1990, 9, 1)), "lokakuu");
-          assert.equal(f(local(1990, 10, 1)), "marraskuu");
-          assert.equal(f(local(1990, 11, 1)), "joulukuu");
-        },
-        "formats AM or PM": function(format) {
-          var f = format("%p");
-          assert.equal(f(local(1990, 0, 1, 0)), "a.m.");
-          assert.equal(f(local(1990, 0, 1, 13)), "p.m.");
-        }
-      },
-
-      "parse": {
-        "parses locale date and time": function(format) {
-          var p = format("%c").parse;
-          assert.deepEqual(p("maanantai, 1. tammikuuta 1990 klo 00:00:00"), local(1990, 0, 1));
-        },
-        "parses locale date": function(format) {
-          var p = format("%x").parse;
-          assert.deepEqual(p("1.1.1990"), local(1990, 0, 1));
-        }
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/locale/locale-huhu-test.js b/test/locale/locale-huhu-test.js
deleted file mode 100644
index 80a62192c2254..0000000000000
--- a/test/locale/locale-huhu-test.js
+++ /dev/null
@@ -1,120 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("../time/time"),
-    local = time.local;
-
-var suite = vows.describe("d3.locale");
-
-suite.addBatch({
-  "locale": {
-    topic: load("locale/hu-HU").expression("d3_locale_huHU"),
-
-    "numberFormat": {
-      topic: function(locale) {
-        return locale.numberFormat;
-      },
-      "formats numbers": function(format) {
-        var f = format(",.2f");
-        assert.equal(f(12345.67), "12\xa0345,67");
-      },
-      "formats currencies": function(format) {
-        var f = format("$,.2f");
-        assert.equal(f(12345.67), "12\xa0345,67\xa0Ft");
-      },
-      "formats currencies with currency suffix": function(format) {
-        var f = format("$,.4s");
-        assert.equal(f(12345.67), "12,35k\xa0Ft");
-      }
-    },
-
-    "timeFormat": {
-      topic: function(locale) {
-        return locale.timeFormat;
-      },
-
-      "format": {
-        "formats locale date and time": function(format) {
-          var f = format("%c");
-          assert.equal(f(local(1990, 0, 1)), "1990. január 1., hétfő 00:00:00");
-        },
-        "formats locale date": function(format) {
-          var f = format("%x");
-          assert.equal(f(local(1990, 0, 1)), "1990. 01. 01.");
-        },
-        "formats locale time": function(format) {
-          var f = format("%X");
-          assert.equal(f(local(1990, 0, 1)), "00:00:00");
-        },
-        "formats abbreviated weekday": function(format) {
-          var f = format("%a");
-          assert.equal(f(local(1990, 0, 1)), "H");
-          assert.equal(f(local(1990, 0, 2)), "K");
-          assert.equal(f(local(1990, 0, 3)), "Sze");
-          assert.equal(f(local(1990, 0, 4)), "Cs");
-          assert.equal(f(local(1990, 0, 5)), "P");
-          assert.equal(f(local(1990, 0, 6)), "Szo");
-          assert.equal(f(local(1990, 0, 7)), "V");
-        },
-        "formats weekday": function(format) {
-          var f = format("%A");
-          assert.equal(f(local(1990, 0, 1)), "hétfő");
-          assert.equal(f(local(1990, 0, 2)), "kedd");
-          assert.equal(f(local(1990, 0, 3)), "szerda");
-          assert.equal(f(local(1990, 0, 4)), "csütörtök");
-          assert.equal(f(local(1990, 0, 5)), "péntek");
-          assert.equal(f(local(1990, 0, 6)), "szombat");
-          assert.equal(f(local(1990, 0, 7)), "vasárnap");
-        },
-        "formats abbreviated month": function(format) {
-          var f = format("%b");
-          assert.equal(f(local(1990, 0, 1)), "jan.");
-          assert.equal(f(local(1990, 1, 1)), "feb.");
-          assert.equal(f(local(1990, 2, 1)), "már.");
-          assert.equal(f(local(1990, 3, 1)), "ápr.");
-          assert.equal(f(local(1990, 4, 1)), "máj.");
-          assert.equal(f(local(1990, 5, 1)), "jún.");
-          assert.equal(f(local(1990, 6, 1)), "júl.");
-          assert.equal(f(local(1990, 7, 1)), "aug.");
-          assert.equal(f(local(1990, 8, 1)), "szept.");
-          assert.equal(f(local(1990, 9, 1)), "okt.");
-          assert.equal(f(local(1990, 10, 1)), "nov.");
-          assert.equal(f(local(1990, 11, 1)), "dec.");
-        },
-        "formats month": function(format) {
-          var f = format("%B");
-          assert.equal(f(local(1990, 0, 1)), "január");
-          assert.equal(f(local(1990, 1, 1)), "február");
-          assert.equal(f(local(1990, 2, 1)), "március");
-          assert.equal(f(local(1990, 3, 1)), "április");
-          assert.equal(f(local(1990, 4, 1)), "május");
-          assert.equal(f(local(1990, 5, 1)), "június");
-          assert.equal(f(local(1990, 6, 1)), "július");
-          assert.equal(f(local(1990, 7, 1)), "augusztus");
-          assert.equal(f(local(1990, 8, 1)), "szeptember");
-          assert.equal(f(local(1990, 9, 1)), "október");
-          assert.equal(f(local(1990, 10, 1)), "november");
-          assert.equal(f(local(1990, 11, 1)), "december");
-        },
-        "formats AM or PM": function(format) {
-          var f = format("%p");
-          assert.equal(f(local(1990, 0, 1, 0)), "de.");
-          assert.equal(f(local(1990, 0, 1, 13)), "du.");
-        }
-      },
-
-      "parse": {
-        "parses locale date and time": function(format) {
-          var p = format("%c").parse;
-          assert.deepEqual(p("1990. január 1., hétfő 00:00:00"), local(1990, 0, 1));
-        },
-        "parses locale date": function(format) {
-          var p = format("%x").parse;
-          assert.deepEqual(p("1990. 01. 01."), local(1990, 0, 1));
-        }
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/locale/locale-ptbr-test.js b/test/locale/locale-ptbr-test.js
deleted file mode 100644
index 93a222ccb7a0f..0000000000000
--- a/test/locale/locale-ptbr-test.js
+++ /dev/null
@@ -1,120 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("../time/time"),
-    local = time.local;
-
-var suite = vows.describe("d3.locale");
-
-suite.addBatch({
-  "locale": {
-    topic: load("locale/pt-BR").expression("d3_locale_ptBR"),
-
-    "numberFormat": {
-      topic: function(locale) {
-        return locale.numberFormat;
-      },
-      "formats numbers": function(format) {
-        var f = format(",.2f");
-        assert.equal(f(12345.67), "12.345,67");
-      },
-      "formats currencies": function(format) {
-        var f = format("$,.2f");
-        assert.equal(f(12345.67), "R$12.345,67");
-      },
-      "formats currencies with SI-prefix notation and currency suffix": function(format) {
-        var f = format("$,.4s");
-        assert.equal(f(12345.67), "R$12,35k");
-      }
-    },
-
-    "timeFormat": {
-      topic: function(locale) {
-        return locale.timeFormat;
-      },
-
-      "format": {
-        "formats locale date and time": function(format) {
-          var f = format("%c");
-          assert.equal(f(local(1990, 0, 1)), "Segunda,  1 de Janeiro de 1990. 00:00:00");
-        },
-        "formats locale date": function(format) {
-          var f = format("%x");
-          assert.equal(f(local(1990, 0, 1)), "01/01/1990");
-        },
-        "formats locale time": function(format) {
-          var f = format("%X");
-          assert.equal(f(local(1990, 0, 1)), "00:00:00");
-        },
-        "formats abbreviated weekday": function(format) {
-          var f = format("%a");
-          assert.equal(f(local(1990, 0, 1)), "Seg");
-          assert.equal(f(local(1990, 0, 2)), "Ter");
-          assert.equal(f(local(1990, 0, 3)), "Qua");
-          assert.equal(f(local(1990, 0, 4)), "Qui");
-          assert.equal(f(local(1990, 0, 5)), "Sex");
-          assert.equal(f(local(1990, 0, 6)), "Sáb");
-          assert.equal(f(local(1990, 0, 7)), "Dom");
-        },
-        "formats weekday": function(format) {
-          var f = format("%A");
-          assert.equal(f(local(1990, 0, 1)), "Segunda");
-          assert.equal(f(local(1990, 0, 2)), "Terça");
-          assert.equal(f(local(1990, 0, 3)), "Quarta");
-          assert.equal(f(local(1990, 0, 4)), "Quinta");
-          assert.equal(f(local(1990, 0, 5)), "Sexta");
-          assert.equal(f(local(1990, 0, 6)), "Sábado");
-          assert.equal(f(local(1990, 0, 7)), "Domingo");
-        },
-        "formats abbreviated month": function(format) {
-          var f = format("%b");
-          assert.equal(f(local(1990, 0, 1)), "Jan");
-          assert.equal(f(local(1990, 1, 1)), "Fev");
-          assert.equal(f(local(1990, 2, 1)), "Mar");
-          assert.equal(f(local(1990, 3, 1)), "Abr");
-          assert.equal(f(local(1990, 4, 1)), "Mai");
-          assert.equal(f(local(1990, 5, 1)), "Jun");
-          assert.equal(f(local(1990, 6, 1)), "Jul");
-          assert.equal(f(local(1990, 7, 1)), "Ago");
-          assert.equal(f(local(1990, 8, 1)), "Set");
-          assert.equal(f(local(1990, 9, 1)), "Out");
-          assert.equal(f(local(1990, 10, 1)), "Nov");
-          assert.equal(f(local(1990, 11, 1)), "Dez");
-        },
-        "formats month": function(format) {
-          var f = format("%B");
-          assert.equal(f(local(1990, 0, 1)), "Janeiro");
-          assert.equal(f(local(1990, 1, 1)), "Fevereiro");
-          assert.equal(f(local(1990, 2, 1)), "Março");
-          assert.equal(f(local(1990, 3, 1)), "Abril");
-          assert.equal(f(local(1990, 4, 1)), "Maio");
-          assert.equal(f(local(1990, 5, 1)), "Junho");
-          assert.equal(f(local(1990, 6, 1)), "Julho");
-          assert.equal(f(local(1990, 7, 1)), "Agosto");
-          assert.equal(f(local(1990, 8, 1)), "Setembro");
-          assert.equal(f(local(1990, 9, 1)), "Outubro");
-          assert.equal(f(local(1990, 10, 1)), "Novembro");
-          assert.equal(f(local(1990, 11, 1)), "Dezembro");
-        },
-        "formats AM or PM": function(format) {
-          var f = format("%p");
-          assert.equal(f(local(1990, 0, 1, 0)), "AM");
-          assert.equal(f(local(1990, 0, 1, 13)), "PM");
-        }
-      },
-
-      "parse": {
-        "parses locale date and time": function(format) {
-          var p = format("%c").parse;
-          assert.deepEqual(p("Segunda,  1 de Janeiro de 1990. 00:00:00"), local(1990, 0, 1));
-        },
-        "parses locale date": function(format) {
-          var p = format("%x").parse;
-          assert.deepEqual(p("01/01/1990"), local(1990, 0, 1));
-        }
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/locale/locale-test.js b/test/locale/locale-test.js
deleted file mode 100644
index e7ed5f38f1caf..0000000000000
--- a/test/locale/locale-test.js
+++ /dev/null
@@ -1,120 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("../time/time"),
-    local = time.local;
-
-var suite = vows.describe("d3.locale");
-
-suite.addBatch({
-  "locale": {
-    topic: load("locale/ru-RU").expression("d3_locale_ruRU"),
-
-    "numberFormat": {
-      topic: function(locale) {
-        return locale.numberFormat;
-      },
-      "formats numbers": function(format) {
-        var f = format(",.2f");
-        assert.equal(f(12345.67), "12 345,67");
-      },
-      "formats currencies": function(format) {
-        var f = format("$,.2f");
-        assert.equal(f(12345.67), "12 345,67 руб.");
-      },
-      "formats currencies with SI-prefix notation and currency suffix": function(format) {
-        var f = format("$,.4s");
-        assert.equal(f(12345.67), "12,35k руб.");
-      }
-    },
-
-    "timeFormat": {
-      topic: function(locale) {
-        return locale.timeFormat;
-      },
-
-      "format": {
-        "formats locale date and time": function(format) {
-          var f = format("%c");
-          assert.equal(f(local(1990, 0, 1)), "понедельник,  1 января 1990 г. 00:00:00");
-        },
-        "formats locale date": function(format) {
-          var f = format("%x");
-          assert.equal(f(local(1990, 0, 1)), "01.01.1990");
-        },
-        "formats locale time": function(format) {
-          var f = format("%X");
-          assert.equal(f(local(1990, 0, 1)), "00:00:00");
-        },
-        "formats abbreviated weekday": function(format) {
-          var f = format("%a");
-          assert.equal(f(local(1990, 0, 1)), "пн");
-          assert.equal(f(local(1990, 0, 2)), "вт");
-          assert.equal(f(local(1990, 0, 3)), "ср");
-          assert.equal(f(local(1990, 0, 4)), "чт");
-          assert.equal(f(local(1990, 0, 5)), "пт");
-          assert.equal(f(local(1990, 0, 6)), "сб");
-          assert.equal(f(local(1990, 0, 7)), "вс");
-        },
-        "formats weekday": function(format) {
-          var f = format("%A");
-          assert.equal(f(local(1990, 0, 1)), "понедельник");
-          assert.equal(f(local(1990, 0, 2)), "вторник");
-          assert.equal(f(local(1990, 0, 3)), "среда");
-          assert.equal(f(local(1990, 0, 4)), "четверг");
-          assert.equal(f(local(1990, 0, 5)), "пятница");
-          assert.equal(f(local(1990, 0, 6)), "суббота");
-          assert.equal(f(local(1990, 0, 7)), "воскресенье");
-        },
-        "formats abbreviated month": function(format) {
-          var f = format("%b");
-          assert.equal(f(local(1990, 0, 1)), "янв");
-          assert.equal(f(local(1990, 1, 1)), "фев");
-          assert.equal(f(local(1990, 2, 1)), "мар");
-          assert.equal(f(local(1990, 3, 1)), "апр");
-          assert.equal(f(local(1990, 4, 1)), "май");
-          assert.equal(f(local(1990, 5, 1)), "июн");
-          assert.equal(f(local(1990, 6, 1)), "июл");
-          assert.equal(f(local(1990, 7, 1)), "авг");
-          assert.equal(f(local(1990, 8, 1)), "сен");
-          assert.equal(f(local(1990, 9, 1)), "окт");
-          assert.equal(f(local(1990, 10, 1)), "ноя");
-          assert.equal(f(local(1990, 11, 1)), "дек");
-        },
-        "formats month": function(format) {
-          var f = format("%B");
-          assert.equal(f(local(1990, 0, 1)), "января");
-          assert.equal(f(local(1990, 1, 1)), "февраля");
-          assert.equal(f(local(1990, 2, 1)), "марта");
-          assert.equal(f(local(1990, 3, 1)), "апреля");
-          assert.equal(f(local(1990, 4, 1)), "мая");
-          assert.equal(f(local(1990, 5, 1)), "июня");
-          assert.equal(f(local(1990, 6, 1)), "июля");
-          assert.equal(f(local(1990, 7, 1)), "августа");
-          assert.equal(f(local(1990, 8, 1)), "сентября");
-          assert.equal(f(local(1990, 9, 1)), "октября");
-          assert.equal(f(local(1990, 10, 1)), "ноября");
-          assert.equal(f(local(1990, 11, 1)), "декабря");
-        },
-        "formats AM or PM": function(format) {
-          var f = format("%p");
-          assert.equal(f(local(1990, 0, 1, 0)), "AM");
-          assert.equal(f(local(1990, 0, 1, 13)), "PM");
-        }
-      },
-
-      "parse": {
-        "parses locale date and time": function(format) {
-          var p = format("%c").parse;
-          assert.deepEqual(p("понедельник,  1 января 1990 г. 00:00:00"), local(1990, 0, 1));
-        },
-        "parses locale date": function(format) {
-          var p = format("%x").parse;
-          assert.deepEqual(p("01.01.1990"), local(1990, 0, 1));
-        }
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/locale/locale-zhcn-test.js b/test/locale/locale-zhcn-test.js
deleted file mode 100644
index 256f1efef749f..0000000000000
--- a/test/locale/locale-zhcn-test.js
+++ /dev/null
@@ -1,120 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("../time/time"),
-    local = time.local;
-
-var suite = vows.describe("d3.locale");
-
-suite.addBatch({
-  "locale": {
-    topic: load("locale/zh-CN").expression("d3_locale_zhCN"),
-
-    "numberFormat": {
-      topic: function(locale) {
-        return locale.numberFormat;
-      },
-      "formats numbers": function(format) {
-        var f = format(",.2f");
-        assert.equal(f(12345.67), "12,345.67");
-      },
-      "formats currencies": function(format) {
-        var f = format("$,.2f");
-        assert.equal(f(12345.67), "¥12,345.67");
-      },
-      "formats currencies with SI-prefix notation and currency suffix": function(format) {
-        var f = format("$,.4s");
-        assert.equal(f(12345.67), "¥12.35k");
-      }
-    },
-
-    "timeFormat": {
-      topic: function(locale) {
-        return locale.timeFormat;
-      },
-
-      "format": {
-        "formats locale date and time": function(format) {
-          var f = format("%c");
-          assert.equal(f(local(1990, 0, 1)), "1990年1月1日 星期一 00:00:00");
-        },
-        "formats locale date": function(format) {
-          var f = format("%x");
-          assert.equal(f(local(1990, 0, 1)), "1990年1月1日");
-        },
-        "formats locale time": function(format) {
-          var f = format("%X");
-          assert.equal(f(local(1990, 0, 1)), "00:00:00");
-        },
-        "formats abbreviated weekday": function(format) {
-          var f = format("%a");
-          assert.equal(f(local(1990, 0, 1)), "周一");
-          assert.equal(f(local(1990, 0, 2)), "周二");
-          assert.equal(f(local(1990, 0, 3)), "周三");
-          assert.equal(f(local(1990, 0, 4)), "周四");
-          assert.equal(f(local(1990, 0, 5)), "周五");
-          assert.equal(f(local(1990, 0, 6)), "周六");
-          assert.equal(f(local(1990, 0, 7)), "周日");
-        },
-        "formats weekday": function(format) {
-          var f = format("%A");
-          assert.equal(f(local(1990, 0, 1)), "星期一");
-          assert.equal(f(local(1990, 0, 2)), "星期二");
-          assert.equal(f(local(1990, 0, 3)), "星期三");
-          assert.equal(f(local(1990, 0, 4)), "星期四");
-          assert.equal(f(local(1990, 0, 5)), "星期五");
-          assert.equal(f(local(1990, 0, 6)), "星期六");
-          assert.equal(f(local(1990, 0, 7)), "星期日");
-        },
-        "formats abbreviated month": function(format) {
-          var f = format("%b");
-          assert.equal(f(local(1990, 0, 1)), "一月");
-          assert.equal(f(local(1990, 1, 1)), "二月");
-          assert.equal(f(local(1990, 2, 1)), "三月");
-          assert.equal(f(local(1990, 3, 1)), "四月");
-          assert.equal(f(local(1990, 4, 1)), "五月");
-          assert.equal(f(local(1990, 5, 1)), "六月");
-          assert.equal(f(local(1990, 6, 1)), "七月");
-          assert.equal(f(local(1990, 7, 1)), "八月");
-          assert.equal(f(local(1990, 8, 1)), "九月");
-          assert.equal(f(local(1990, 9, 1)), "十月");
-          assert.equal(f(local(1990, 10, 1)), "十一月");
-          assert.equal(f(local(1990, 11, 1)), "十二月");
-        },
-        "formats month": function(format) {
-          var f = format("%B");
-          assert.equal(f(local(1990, 0, 1)), "一月");
-          assert.equal(f(local(1990, 1, 1)), "二月");
-          assert.equal(f(local(1990, 2, 1)), "三月");
-          assert.equal(f(local(1990, 3, 1)), "四月");
-          assert.equal(f(local(1990, 4, 1)), "五月");
-          assert.equal(f(local(1990, 5, 1)), "六月");
-          assert.equal(f(local(1990, 6, 1)), "七月");
-          assert.equal(f(local(1990, 7, 1)), "八月");
-          assert.equal(f(local(1990, 8, 1)), "九月");
-          assert.equal(f(local(1990, 9, 1)), "十月");
-          assert.equal(f(local(1990, 10, 1)), "十一月");
-          assert.equal(f(local(1990, 11, 1)), "十二月");
-        },
-        "formats AM or PM": function(format) {
-          var f = format("%p");
-          assert.equal(f(local(1990, 0, 1, 0)), "上午");
-          assert.equal(f(local(1990, 0, 1, 13)), "下午");
-        }
-      },
-
-      "parse": {
-        "parses locale date and time": function(format) {
-          var p = format("%c").parse;
-          assert.deepEqual(p("1990年1月1日 星期一 00:00:00"), local(1990, 0, 1));
-        },
-        "parses locale date": function(format) {
-          var p = format("%x").parse;
-          assert.deepEqual(p("1990年1月1日"), local(1990, 0, 1));
-        }
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/math/transform-rotate-test.html b/test/math/transform-rotate-test.html
index bf5eb55951fb6..f30cbe9b43951 100644
--- a/test/math/transform-rotate-test.html
+++ b/test/math/transform-rotate-test.html
@@ -44,21 +44,19 @@
 <script src="../../d3.js"></script>
 <script>
 
-var format = d3.format(",.2f");
-
 var tests = [
-  {start:  170, end:  225, expected: [ 170.00, -176.25, -162.50, -148.75, -135.00]},
-  {start:  225, end:  170, expected: [-135.00, -148.75, -162.50, -176.25,  170.00]},
-  {start: -170, end: -225, expected: [-170.00,  176.25,  162.50,  148.75,  135.00]},
-  {start: -225, end: -170, expected: [ 135.00,  148.75,  162.50,  176.25, -170.00]},
-  {start: -170, end:  170, expected: [-170.00, -175.00,  180.00,  175.00,  170.00]},
-  {start: -170, end:    0, expected: [-170.00, -127.50,  -85.00,  -42.50,    0.00]},
-  {start:  170, end:    0, expected: [ 170.00,  127.50,   85.00,   42.50,    0.00]},
-  {start: -180, end:   90, expected: [ 180.00,  157.50,  135.00,  112.50,   90.00]},
-  {start:  180, end:   90, expected: [ 180.00,  157.50,  135.00,  112.50,   90.00]},
-  {start: -180, end:  -90, expected: [-180.00, -157.50, -135.00, -112.50,  -90.00]},
-  {start:  180, end:  -90, expected: [ 180.00, -157.50, -135.00, -112.50,  -90.00]},
-  {start:  780, end:  -90, expected: [  60.00,  22.50,  -15.00,   -52.50,  -90.00]}
+  {start:  170, end:  225, expected: [ 170, -176.25, -162.50, -148.75, -135]},
+  {start:  225, end:  170, expected: [-135, -148.75, -162.50, -176.25,  170]},
+  {start: -170, end: -225, expected: [-170,  176.25,  162.50,  148.75,  135]},
+  {start: -225, end: -170, expected: [ 135,  148.75,  162.50,  176.25, -170]},
+  {start: -170, end:  170, expected: [-170, -175,  180,  175,  170]},
+  {start: -170, end:    0, expected: [-170, -127.50,  -85,  -42.50,    0]},
+  {start:  170, end:    0, expected: [ 170,  127.50,   85,   42.50,    0]},
+  {start: -180, end:   90, expected: [ 180,  157.50,  135,  112.50,   90]},
+  {start:  180, end:   90, expected: [ 180,  157.50,  135,  112.50,   90]},
+  {start: -180, end:  -90, expected: [-180, -157.50, -135, -112.50,  -90]},
+  {start:  180, end:  -90, expected: [ 180, -157.50, -135, -112.50,  -90]},
+  {start:  780, end:  -90, expected: [  60,  22.50,  -15,   -52.50,  -90]}
 ];
 
 var tr = d3.select("tbody").selectAll("tr")
@@ -66,10 +64,10 @@
   .enter().append("tr");
 
 tr.append("td")
-    .text(function(d) { return format(d.start); });
+    .text(function(d) { return d.start; });
 
 tr.append("td")
-    .text(function(d) { return format(d.end); });
+    .text(function(d) { return d.end; });
 
 tr.selectAll(".actual")
     .data(function(d) {
@@ -82,7 +80,7 @@
       });
     })
   .enter().append("td")
-    .text(function(d, i) { return format(d.actual); })
+    .text(function(d, i) { return d.actual; })
     .attr("class", function(d) { return Math.abs(d.actual - d.expected) < 0.01 ? "success" : "fail"; });
 
 var ga = tr.append("td").attr("width", 40).append("svg")
diff --git a/test/scale/log-test.js b/test/scale/log-test.js
index 02649d4358d55..6962be122b5d3 100644
--- a/test/scale/log-test.js
+++ b/test/scale/log-test.js
@@ -264,15 +264,6 @@ suite.addBatch({
           "1e+4"
         ]);
       },
-      "can override the tick format": function(d3) {
-        var x = d3.scale.log().domain([1000.1, 1]);
-        assert.deepEqual(x.ticks().map(x.tickFormat(10, d3.format("+,d"))), [
-          "+1", "+2", "+3", "", "", "", "", "", "",
-          "+10", "+20", "+30", "", "", "", "", "", "",
-          "+100", "+200", "+300", "", "", "", "", "", "",
-          "+1,000"
-        ]);
-      },
       "can override the tick format as string": function(d3) {
         var x = d3.scale.log().domain([1000.1, 1]);
         assert.deepEqual(x.ticks().map(x.tickFormat(10, ".1s")), [
@@ -293,38 +284,6 @@ suite.addBatch({
       }
     },
 
-    "base two": {
-      topic: function(d3) {
-        return d3.scale.log().domain([1, 32]).base(2);
-      },
-      "with a suitable tick format": {
-        topic: function(x, d3) {
-          return x.ticks().map(x.tickFormat(10, d3.format("+,d")));
-        },
-        "generates ticks at powers of two": function(ticks) {
-          assert.deepEqual(ticks, [
-            "+1", "+2", "+4", "+8", "+16", "+32"
-          ]);
-        }
-      }
-    },
-
-    "base e": {
-      topic: function(d3) {
-        return d3.scale.log().domain([1, 32]).base(Math.E);
-      },
-      "with a suitable tick format": {
-        topic: function(x, d3) {
-          return x.ticks().map(x.tickFormat(10, d3.format("+0.6r")));
-        },
-        "generates ticks at powers of e": function(ticks) {
-          assert.deepEqual(ticks, [
-            "+1.00000", "+2.71828", "+7.38906", "+20.0855"
-          ]);
-        }
-      }
-    },
-
     "nice": {
       "can nice the domain, extending it to powers of ten": function(d3) {
         var x = d3.scale.log().domain([1.1, 10.9]).nice();
diff --git a/test/scale/pow-test.js b/test/scale/pow-test.js
index b929eb0d147c2..c562da34cd0c3 100644
--- a/test/scale/pow-test.js
+++ b/test/scale/pow-test.js
@@ -101,18 +101,6 @@ suite.addBatch({
         assert.inDelta(x(1.5), 0.6666667, 1e-6);
         assert.inDelta(x(2), 1, 1e-6);
         assert.equal(x.exponent(), -1);
-      },
-      "changing the exponent does not change the domain or range": function(d3) {
-        var x = d3.scale.pow().domain([1, 2]).range([3, 4]), f = d3.format(".6f");
-        x.exponent(0.5);
-        assert.deepEqual(x.domain().map(f), [1, 2]);
-        assert.deepEqual(x.range(), [3, 4]);
-        x.exponent(2);
-        assert.deepEqual(x.domain().map(f), [1, 2]);
-        assert.deepEqual(x.range(), [3, 4]);
-        x.exponent(-1);
-        assert.deepEqual(x.domain().map(f), [1, 2]);
-        assert.deepEqual(x.range(), [3, 4]);
       }
     },
 
diff --git a/test/scale/sqrt-test.js b/test/scale/sqrt-test.js
index 97b8eb3fdbfbd..afe456622dc99 100644
--- a/test/scale/sqrt-test.js
+++ b/test/scale/sqrt-test.js
@@ -102,18 +102,6 @@ suite.addBatch({
         assert.inDelta(x(1), 0, 1e-6);
         assert.inDelta(x(1.5), 0.6666667, 1e-6);
         assert.inDelta(x(2), 1, 1e-6);
-      },
-      "changing the exponent does not change the domain or range": function(d3) {
-        var x = d3.scale.sqrt().domain([1, 2]).range([3, 4]), f = d3.format(".6f");
-        x.exponent(0.5);
-        assert.deepEqual(x.domain().map(f), [1, 2]);
-        assert.deepEqual(x.range(), [3, 4]);
-        x.exponent(2);
-        assert.deepEqual(x.domain().map(f), [1, 2]);
-        assert.deepEqual(x.range(), [3, 4]);
-        x.exponent(-1);
-        assert.deepEqual(x.domain().map(f), [1, 2]);
-        assert.deepEqual(x.range(), [3, 4]);
       }
     },
 
@@ -183,24 +171,6 @@ suite.addBatch({
     },
 
     "nice": {
-      "can nice the domain, extending it to round numbers": function(d3) {
-        var x = d3.scale.sqrt().domain([1.1, 10.9]).nice(), f = d3.format(".6f");
-        assert.deepEqual(x.domain().map(f), [1, 11]);
-        var x = d3.scale.sqrt().domain([10.9, 1.1]).nice();
-        assert.deepEqual(x.domain().map(f), [11, 1]);
-        var x = d3.scale.sqrt().domain([0.7, 11.001]).nice();
-        assert.deepEqual(x.domain().map(f), [0, 12]);
-        var x = d3.scale.sqrt().domain([123.1, 6.7]).nice();
-        assert.deepEqual(x.domain().map(f), [130, 0]);
-        var x = d3.scale.sqrt().domain([0, 0.49]).nice();
-        assert.deepEqual(x.domain().map(f), [0, 0.5]);
-      },
-      "nicing a polypower domain only affects the extent": function(d3) {
-        var x = d3.scale.sqrt().domain([1.1, 1, 2, 3, 10.9]).nice(), f = d3.format(".6f");
-        assert.deepEqual(x.domain().map(f), [1, 1, 2, 3, 11]);
-        var x = d3.scale.sqrt().domain([123.1, 1, 2, 3, -0.9]).nice();
-        assert.deepEqual(x.domain().map(f), [140, 1, 2, 3, -20]);
-      },
       "preserves specified domain exactly, with no floating point error": function(d3) {
         var x = d3.scale.sqrt().domain([0, 5]).nice();
         assert.deepEqual(x.domain(), [0, 5]);
diff --git a/test/selection/data-benchmark.js b/test/selection/data-benchmark.js
index 2331fbe697739..1ddeccc986d02 100644
--- a/test/selection/data-benchmark.js
+++ b/test/selection/data-benchmark.js
@@ -1,7 +1,6 @@
 var d3 = require("../../");
 
-var formatNumber = d3.format(",.02r"),
-    values = d3.range(0, 1000),
+var values = d3.range(0, 1000),
     key = function(x) { return x; },
     div = d3.select("html").append("div"),
     selection,
@@ -14,7 +13,7 @@ for (var i = 0; i < n; i++) {
   selection.data(values, key);
 }
 
-console.log("selection.data(values, key) (enter) " + formatNumber((Date.now() - then) / i) + "ms/op.");
+console.log("selection.data(values, key) (enter) " + (Date.now() - then) / i) + "ms/op.";
 
 selection.data(values, key)
   .enter().append("div");
@@ -26,4 +25,4 @@ for (var i = 0; i < n; i++) {
   selection.data(values, key);
 }
 
-console.log("selection.data(values, key) (update) " + formatNumber((Date.now() - then) / i) + "ms/op.");
+console.log("selection.data(values, key) (update) " + (Date.now() - then) / i) + "ms/op.";
diff --git a/test/svg/axis-test.js b/test/svg/axis-test.js
index 0bcefa9afd7f2..0f79d8b8c0aa9 100644
--- a/test/svg/axis-test.js
+++ b/test/svg/axis-test.js
@@ -415,12 +415,6 @@ suite.addBatch({
         var t = g.selectAll("g text");
         assert.equal(t.text(), "foo-0");
       },
-      "affects the generated tick labels": function(d3) {
-        var a = d3.svg.axis().tickFormat(d3.format("+.2%")),
-            g = d3.select("body").html("").append("g").call(a),
-            t = g.selectAll("g text");
-        assert.equal(t.text(), "+0.00%");
-      },
       "can be set to a constant": function(d3) {
         var a = d3.svg.axis().tickFormat("I'm a tick!"),
             g = d3.select("body").html("").append("g").call(a),
diff --git a/test/time/day-test.js b/test/time/day-test.js
deleted file mode 100644
index c408b5ae9447c..0000000000000
--- a/test/time/day-test.js
+++ /dev/null
@@ -1,178 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("./time"),
-    local = time.local,
-    utc = time.utc;
-
-var suite = vows.describe("d3.time.day");
-
-suite.addBatch({
-  "day": {
-    topic: load("time/day").expression("d3.time.day"),
-    "defaults to floor": function(interval) {
-      assert.strictEqual(interval, interval.floor);
-    },
-    "floor": {
-      topic: function(interval) {
-        return interval.floor;
-      },
-      "returns midnights": function(floor) {
-        assert.deepEqual(floor(local(2010, 11, 31, 23)), local(2010, 11, 31));
-        assert.deepEqual(floor(local(2011, 00, 01, 00)), local(2011, 00, 01));
-        assert.deepEqual(floor(local(2011, 00, 01, 01)), local(2011, 00, 01));
-      },
-      "observes start of daylight savings time": function(floor) {
-        assert.deepEqual(floor(utc(2011, 02, 13, 07)), local(2011, 02, 12));
-        assert.deepEqual(floor(utc(2011, 02, 13, 08)), local(2011, 02, 13));
-        assert.deepEqual(floor(utc(2011, 02, 13, 09)), local(2011, 02, 13));
-        assert.deepEqual(floor(utc(2011, 02, 13, 10)), local(2011, 02, 13));
-      },
-      "observes end of daylight savings time": function(floor) {
-        assert.deepEqual(floor(utc(2011, 10, 06, 07)), local(2011, 10, 06));
-        assert.deepEqual(floor(utc(2011, 10, 06, 08)), local(2011, 10, 06));
-        assert.deepEqual(floor(utc(2011, 10, 06, 09)), local(2011, 10, 06));
-        assert.deepEqual(floor(utc(2011, 10, 06, 10)), local(2011, 10, 06));
-      },
-      "correctly handles years in the first century": function(floor) {
-        assert.deepEqual(floor(local(0011, 10, 06, 07)), local(0011, 10, 06));
-      }
-    },
-    "ceil": {
-      topic: function(interval) {
-        return interval.ceil;
-      },
-      "returns midnights": function(ceil) {
-        assert.deepEqual(ceil(local(2010, 11, 30, 23)), local(2010, 11, 31));
-        assert.deepEqual(ceil(local(2010, 11, 31, 00)), local(2010, 11, 31));
-        assert.deepEqual(ceil(local(2010, 11, 31, 01)), local(2011, 00, 01));
-      },
-      "observes start of daylight savings time": function(ceil) {
-        assert.deepEqual(ceil(utc(2011, 02, 13, 07)), local(2011, 02, 13));
-        assert.deepEqual(ceil(utc(2011, 02, 13, 08)), local(2011, 02, 13));
-        assert.deepEqual(ceil(utc(2011, 02, 13, 09)), local(2011, 02, 14));
-        assert.deepEqual(ceil(utc(2011, 02, 13, 10)), local(2011, 02, 14));
-      },
-      "observes end of daylight savings time": function(ceil) {
-        assert.deepEqual(ceil(utc(2011, 10, 06, 07)), local(2011, 10, 06));
-        assert.deepEqual(ceil(utc(2011, 10, 06, 08)), local(2011, 10, 07));
-        assert.deepEqual(ceil(utc(2011, 10, 06, 09)), local(2011, 10, 07));
-        assert.deepEqual(ceil(utc(2011, 10, 06, 10)), local(2011, 10, 07));
-      },
-      "handles midnight for leap years": function(ceil) {
-        assert.deepEqual(ceil(utc(2012, 02, 01, 00)), local(2012, 02, 01));
-        assert.deepEqual(ceil(utc(2012, 02, 01, 00)), local(2012, 02, 01));
-      }
-    },
-    "offset": {
-      topic: function(interval) {
-        return interval.offset;
-      },
-      "does not modify the passed-in date": function(offset) {
-        var date = local(2010, 11, 31, 23, 59, 59, 999);
-        offset(date, +1);
-        assert.deepEqual(date, local(2010, 11, 31, 23, 59, 59, 999));
-      },
-      "does not round the passed-in-date": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 999), +1), local(2011, 00, 01, 23, 59, 59, 999));
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 456), -2), local(2010, 11, 29, 23, 59, 59, 456));
-      },
-      "allows negative offsets": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31), -1), local(2010, 11, 30));
-        assert.deepEqual(offset(local(2011, 00, 01), -2), local(2010, 11, 30));
-        assert.deepEqual(offset(local(2011, 00, 01), -1), local(2010, 11, 31));
-      },
-      "allows positive offsets": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31), +1), local(2011, 00, 01));
-        assert.deepEqual(offset(local(2010, 11, 30), +2), local(2011, 00, 01));
-        assert.deepEqual(offset(local(2010, 11, 30), +1), local(2010, 11, 31));
-      },
-      "allows zero offset": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 999), 0), local(2010, 11, 31, 23, 59, 59, 999));
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 58, 000), 0), local(2010, 11, 31, 23, 59, 58, 000));
-      }
-    },
-    "UTC": {
-      topic: function(interval) {
-        return interval.utc;
-      },
-      "defaults to floor": function(interval) {
-        assert.strictEqual(interval, interval.floor);
-      },
-      "floor": {
-        topic: function(interval) {
-          return interval.floor;
-        },
-        "returns midnights": function(floor) {
-          assert.deepEqual(floor(utc(2010, 11, 31, 23)), utc(2010, 11, 31));
-          assert.deepEqual(floor(utc(2011, 00, 01, 00)), utc(2011, 00, 01));
-          assert.deepEqual(floor(utc(2011, 00, 01, 01)), utc(2011, 00, 01));
-        },
-        "does not observe the start of daylight savings time": function(floor) {
-          assert.deepEqual(floor(utc(2011, 02, 13, 07)), utc(2011, 02, 13));
-          assert.deepEqual(floor(utc(2011, 02, 13, 08)), utc(2011, 02, 13));
-          assert.deepEqual(floor(utc(2011, 02, 13, 09)), utc(2011, 02, 13));
-          assert.deepEqual(floor(utc(2011, 02, 13, 10)), utc(2011, 02, 13));
-        },
-        "does not observe the end of daylight savings time": function(floor) {
-          assert.deepEqual(floor(utc(2011, 10, 06, 05)), utc(2011, 10, 06));
-          assert.deepEqual(floor(utc(2011, 10, 06, 06)), utc(2011, 10, 06));
-          assert.deepEqual(floor(utc(2011, 10, 06, 07)), utc(2011, 10, 06));
-          assert.deepEqual(floor(utc(2011, 10, 06, 08)), utc(2011, 10, 06));
-        }
-      },
-      "ceil": {
-        topic: function(interval) {
-          return interval.ceil;
-        },
-        "returns midnights": function(ceil) {
-          assert.deepEqual(ceil(utc(2010, 11, 30, 23)), utc(2010, 11, 31));
-          assert.deepEqual(ceil(utc(2010, 11, 31, 00)), utc(2010, 11, 31));
-          assert.deepEqual(ceil(utc(2010, 11, 31, 01)), utc(2011, 00, 01));
-        },
-        "does not observe the start of daylight savings time": function(ceil) {
-          assert.deepEqual(ceil(utc(2011, 02, 13, 07)), utc(2011, 02, 14));
-          assert.deepEqual(ceil(utc(2011, 02, 13, 08)), utc(2011, 02, 14));
-          assert.deepEqual(ceil(utc(2011, 02, 13, 09)), utc(2011, 02, 14));
-          assert.deepEqual(ceil(utc(2011, 02, 13, 10)), utc(2011, 02, 14));
-        },
-        "does not observe the end of daylight savings time": function(ceil) {
-          assert.deepEqual(ceil(utc(2011, 10, 06, 05)), utc(2011, 10, 07));
-          assert.deepEqual(ceil(utc(2011, 10, 06, 06)), utc(2011, 10, 07));
-          assert.deepEqual(ceil(utc(2011, 10, 06, 07)), utc(2011, 10, 07));
-          assert.deepEqual(ceil(utc(2011, 10, 06, 08)), utc(2011, 10, 07));
-        }
-      },
-      "offset": {
-        topic: function(interval) {
-          return interval.offset;
-        },
-        "does not modify the passed-in date": function(offset) {
-          var date = utc(2010, 11, 31, 23, 59, 59, 999);
-          offset(date, +1);
-          assert.deepEqual(date, utc(2010, 11, 31, 23, 59, 59, 999));
-        },
-        "does not round the passed-in-date": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 999), +1), utc(2011, 00, 01, 23, 59, 59, 999));
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 456), -2), utc(2010, 11, 29, 23, 59, 59, 456));
-        },
-        "allows negative offsets": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31), -1), utc(2010, 11, 30));
-          assert.deepEqual(offset(utc(2011, 00, 01), -2), utc(2010, 11, 30));
-          assert.deepEqual(offset(utc(2011, 00, 01), -1), utc(2010, 11, 31));
-        },
-        "allows positive offsets": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31), +1), utc(2011, 00, 01));
-          assert.deepEqual(offset(utc(2010, 11, 30), +2), utc(2011, 00, 01));
-          assert.deepEqual(offset(utc(2010, 11, 30), +1), utc(2010, 11, 31));
-        },
-        "allows zero offset": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 999), 0), utc(2010, 11, 31, 23, 59, 59, 999));
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 58, 000), 0), utc(2010, 11, 31, 23, 59, 58, 000));
-        }
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/time/dayOfYear-test.js b/test/time/dayOfYear-test.js
deleted file mode 100644
index 91866cd78e388..0000000000000
--- a/test/time/dayOfYear-test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert");
-
-var suite = vows.describe("d3.time.dayOfYear");
-
-suite.addBatch({
-  "dayOfYear": {
-    topic: load("time/day").expression("d3.time.dayOfYear"),
-    "no floating-point rounding error": function(dayOfYear) {
-      assert.equal(dayOfYear(new Date(2011, 4, 9)), 128);
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/time/days-test.js b/test/time/days-test.js
deleted file mode 100644
index e20dc36c8209e..0000000000000
--- a/test/time/days-test.js
+++ /dev/null
@@ -1,95 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("./time"),
-    local = time.local,
-    utc = time.utc;
-
-var suite = vows.describe("d3.time.days");
-
-suite.addBatch({
-  "days": {
-    topic: load("time/day").expression("d3.time.days"),
-    "returns midnights": function(range) {
-      assert.deepEqual(range(local(2010, 11, 31, 12), local(2011, 0, 3, 12)), [
-        local(2011, 0, 1),
-        local(2011, 0, 2),
-        local(2011, 0, 3)
-      ]);
-    },
-    "has an inclusive lower bound": function(range) {
-      assert.deepEqual(range(local(2010, 11, 31), local(2011, 0, 3))[0], local(2010, 11, 31));
-    },
-    "has an exclusive upper bound": function(range) {
-      assert.deepEqual(range(local(2010, 11, 31), local(2011, 0, 3))[2], local(2011, 0, 2));
-    },
-    "can skip days": function(range) {
-      assert.deepEqual(range(local(2010, 11, 29), local(2011, 0, 14), 5), [
-        local(2010, 11, 31),
-        local(2011, 0, 1),
-        local(2011, 0, 6),
-        local(2011, 0, 11)
-      ]);
-    },
-    "observes start of daylight savings time": function(range) {
-      assert.deepEqual(range(local(2011, 2, 12), local(2011, 2, 16)), [
-        local(2011, 2, 12),
-        local(2011, 2, 13),
-        local(2011, 2, 14),
-        local(2011, 2, 15)
-      ]);
-    },
-    "observes end of daylight savings time": function(range) {
-      assert.deepEqual(range(local(2011, 10, 5), local(2011, 10, 9)), [
-        local(2011, 10, 5),
-        local(2011, 10, 6),
-        local(2011, 10, 7),
-        local(2011, 10, 8)
-      ]);
-    },
-    "UTC": {
-      topic: function(range) {
-        return range.utc;
-      },
-      "returns midnights": function(range) {
-        assert.deepEqual(range(utc(2010, 11, 31, 12), utc(2011, 0, 3, 12)), [
-          utc(2011, 0, 1),
-          utc(2011, 0, 2),
-          utc(2011, 0, 3)
-        ]);
-      },
-      "has an inclusive lower bound": function(range) {
-        assert.deepEqual(range(utc(2010, 11, 31), utc(2011, 0, 3))[0], utc(2010, 11, 31));
-      },
-      "has an exclusive upper bound": function(range) {
-        assert.deepEqual(range(utc(2010, 11, 31), utc(2011, 0, 3))[2], utc(2011, 0, 2));
-      },
-      "can skip days": function(range) {
-        assert.deepEqual(range(utc(2010, 11, 29), utc(2011, 0, 14), 5), [
-          utc(2010, 11, 31),
-          utc(2011, 0, 1),
-          utc(2011, 0, 6),
-          utc(2011, 0, 11)
-        ]);
-      },
-      "does not observe the start of daylight savings time": function(range) {
-        assert.deepEqual(range(utc(2011, 2, 12), utc(2011, 2, 16)), [
-          utc(2011, 2, 12),
-          utc(2011, 2, 13),
-          utc(2011, 2, 14),
-          utc(2011, 2, 15)
-        ]);
-      },
-      "does not observe the end of daylight savings time": function(range) {
-        assert.deepEqual(range(utc(2011, 10, 5), utc(2011, 10, 9)), [
-          utc(2011, 10, 5),
-          utc(2011, 10, 6),
-          utc(2011, 10, 7),
-          utc(2011, 10, 8)
-        ]);
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/time/format-iso-test.js b/test/time/format-iso-test.js
deleted file mode 100644
index fbc0f91e42874..0000000000000
--- a/test/time/format-iso-test.js
+++ /dev/null
@@ -1,33 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("./time"),
-    utc = time.utc;
-
-var suite = vows.describe("d3.time.format");
-
-suite.addBatch({
-  "format.iso": {
-    topic: load("time/format-iso").expression("d3.time.format.iso"),
-
-    "toString is %Y-%m-%dT%H:%M:%S.%LZ": function(format) {
-      assert.equal(format + "", "%Y-%m-%dT%H:%M:%S.%LZ");
-    },
-
-    "formats as ISO 8601": function(format) {
-      assert.equal(format(utc(1990, 0, 1, 0, 0, 0)), "1990-01-01T00:00:00.000Z");
-      assert.equal(format(utc(2011, 11, 31, 23, 59, 59)), "2011-12-31T23:59:59.000Z");
-    },
-
-    "parse": {
-      "parses as ISO 8601": function(format) {
-        var p = format.parse;
-        assert.deepEqual(p("1990-01-01T00:00:00.000Z"), utc(1990, 0, 1, 0, 0, 0));
-        assert.deepEqual(p("2011-12-31T23:59:59.000Z"), utc(2011, 11, 31, 23, 59, 59));
-        assert.isNull(p("1990-01-01T00:00:00.000X"));
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/time/format-test.js b/test/time/format-test.js
deleted file mode 100644
index efdc04e633889..0000000000000
--- a/test/time/format-test.js
+++ /dev/null
@@ -1,366 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("./time"),
-    local = time.local;
-
-var suite = vows.describe("d3.time.format");
-
-suite.addBatch({
-  "format": {
-    topic: load("time/format").expression("d3.time.format"),
-    "formats abbreviated weekday": function(format) {
-      var f = format("%a");
-      assert.equal(f(local(1990, 0, 1)), "Mon");
-      assert.equal(f(local(1990, 0, 2)), "Tue");
-      assert.equal(f(local(1990, 0, 3)), "Wed");
-      assert.equal(f(local(1990, 0, 4)), "Thu");
-      assert.equal(f(local(1990, 0, 5)), "Fri");
-      assert.equal(f(local(1990, 0, 6)), "Sat");
-      assert.equal(f(local(1990, 0, 7)), "Sun");
-    },
-    "formats weekday": function(format) {
-      var f = format("%A");
-      assert.equal(f(local(1990, 0, 1)), "Monday");
-      assert.equal(f(local(1990, 0, 2)), "Tuesday");
-      assert.equal(f(local(1990, 0, 3)), "Wednesday");
-      assert.equal(f(local(1990, 0, 4)), "Thursday");
-      assert.equal(f(local(1990, 0, 5)), "Friday");
-      assert.equal(f(local(1990, 0, 6)), "Saturday");
-      assert.equal(f(local(1990, 0, 7)), "Sunday");
-    },
-    "formats abbreviated month": function(format) {
-      var f = format("%b");
-      assert.equal(f(local(1990, 0, 1)), "Jan");
-      assert.equal(f(local(1990, 1, 1)), "Feb");
-      assert.equal(f(local(1990, 2, 1)), "Mar");
-      assert.equal(f(local(1990, 3, 1)), "Apr");
-      assert.equal(f(local(1990, 4, 1)), "May");
-      assert.equal(f(local(1990, 5, 1)), "Jun");
-      assert.equal(f(local(1990, 6, 1)), "Jul");
-      assert.equal(f(local(1990, 7, 1)), "Aug");
-      assert.equal(f(local(1990, 8, 1)), "Sep");
-      assert.equal(f(local(1990, 9, 1)), "Oct");
-      assert.equal(f(local(1990, 10, 1)), "Nov");
-      assert.equal(f(local(1990, 11, 1)), "Dec");
-    },
-    "formats month": function(format) {
-      var f = format("%B");
-      assert.equal(f(local(1990, 0, 1)), "January");
-      assert.equal(f(local(1990, 1, 1)), "February");
-      assert.equal(f(local(1990, 2, 1)), "March");
-      assert.equal(f(local(1990, 3, 1)), "April");
-      assert.equal(f(local(1990, 4, 1)), "May");
-      assert.equal(f(local(1990, 5, 1)), "June");
-      assert.equal(f(local(1990, 6, 1)), "July");
-      assert.equal(f(local(1990, 7, 1)), "August");
-      assert.equal(f(local(1990, 8, 1)), "September");
-      assert.equal(f(local(1990, 9, 1)), "October");
-      assert.equal(f(local(1990, 10, 1)), "November");
-      assert.equal(f(local(1990, 11, 1)), "December");
-    },
-    "formats locale date and time": function(format) {
-      var f = format("%c");
-      assert.equal(f(local(1990, 0, 1)), "Mon Jan  1 00:00:00 1990");
-    },
-    "formats zero-padded date": function(format) {
-      var f = format("%d");
-      assert.equal(f(local(1990, 0, 1)), "01");
-    },
-    "formats space-padded date": function(format) {
-      var f = format("%e");
-      assert.equal(f(local(1990, 0, 1)), " 1");
-    },
-    "formats zero-padded hour (24)": function(format) {
-      var f = format("%H");
-      assert.equal(f(local(1990, 0, 1, 0)), "00");
-      assert.equal(f(local(1990, 0, 1, 13)), "13");
-    },
-    "formats zero-padded hour (12)": function(format) {
-      var f = format("%I");
-      assert.equal(f(local(1990, 0, 1, 0)), "12");
-      assert.equal(f(local(1990, 0, 1, 13)), "01");
-    },
-    "formats zero-padded day of year": function(format) {
-      var f = format("%j");
-      assert.equal(f(local(1990, 0, 1)), "001");
-      assert.equal(f(local(1990, 5, 1)), "152");
-      assert.equal(f(local(2010, 2, 13)), "072");
-      assert.equal(f(local(2010, 2, 14)), "073"); // DST begins
-      assert.equal(f(local(2010, 2, 15)), "074");
-      assert.equal(f(local(2010, 10, 6)), "310");
-      assert.equal(f(local(2010, 10, 7)), "311"); // DST ends
-      assert.equal(f(local(2010, 10, 8)), "312");
-    },
-    "formats zero-padded month": function(format) {
-      var f = format("%m");
-      assert.equal(f(local(1990, 0, 1)), "01");
-      assert.equal(f(local(1990, 9, 1)), "10");
-    },
-    "formats zero-padded minute": function(format) {
-      var f = format("%M");
-      assert.equal(f(local(1990, 0, 1, 0, 0)), "00");
-      assert.equal(f(local(1990, 0, 1, 0, 32)), "32");
-    },
-    "formats AM or PM": function(format) {
-      var f = format("%p");
-      assert.equal(f(local(1990, 0, 1, 0)), "AM");
-      assert.equal(f(local(1990, 0, 1, 13)), "PM");
-    },
-    "formats zero-padded second": function(format) {
-      var f = format("%S");
-      assert.equal(f(local(1990, 0, 1, 0, 0, 0)), "00");
-      assert.equal(f(local(1990, 0, 1, 0, 0, 32)), "32");
-      var f = format("%0S");
-      assert.equal(f(local(1990, 0, 1, 0, 0, 0)), "00");
-      assert.equal(f(local(1990, 0, 1, 0, 0, 32)), "32");
-    },
-    "formats space-padded second": function(format) {
-      var f = format("%_S");
-      assert.equal(f(local(1990, 0, 1, 0, 0, 0)), " 0");
-      assert.equal(f(local(1990, 0, 1, 0, 0, 3)), " 3");
-      assert.equal(f(local(1990, 0, 1, 0, 0, 32)), "32");
-    },
-    "formats no-padded second": function(format) {
-      var f = format("%-S");
-      assert.equal(f(local(1990, 0, 1, 0, 0, 0)), "0");
-      assert.equal(f(local(1990, 0, 1, 0, 0, 3)), "3");
-      assert.equal(f(local(1990, 0, 1, 0, 0, 32)), "32");
-    },
-    "formats zero-padded millisecond": function(format) {
-      var f = format("%L");
-      assert.equal(f(local(1990, 0, 1, 0, 0, 0, 0)), "000");
-      assert.equal(f(local(1990, 0, 1, 0, 0, 0, 432)), "432");
-    },
-    "formats zero-padded week number": function(format) {
-      var f = format("%U");
-      assert.equal(f(local(1990, 0, 1)), "00");
-      assert.equal(f(local(1990, 5, 1)), "21");
-      assert.equal(f(local(2010, 2, 13, 23)), "10");
-      assert.equal(f(local(2010, 2, 14, 00)), "11"); // DST begins
-      assert.equal(f(local(2010, 2, 15, 00)), "11");
-      assert.equal(f(local(2010, 10, 6, 23)), "44");
-      assert.equal(f(local(2010, 10, 7, 00)), "45"); // DST ends
-      assert.equal(f(local(2010, 10, 8, 00)), "45");
-    },
-    "formats locale date": function(format) {
-      var f = format("%x");
-      assert.equal(f(local(1990, 0, 1)), "01/01/1990");
-      assert.equal(f(local(2010, 5, 1)), "06/01/2010");
-    },
-    "formats locale time": function(format) {
-      var f = format("%X");
-      assert.equal(f(local(1990, 0, 1)), "00:00:00");
-      assert.equal(f(local(1990, 0, 1, 13, 34, 59)), "13:34:59");
-    },
-    "formats zero-padded two-digit year": function(format) {
-      var f = format("%y");
-      assert.equal(f(local(1990, 0, 1)), "90");
-      assert.equal(f(local(2002, 0, 1)), "02");
-      assert.equal(f(local(-2, 0, 1)), "-02");
-    },
-    "formats zero-padded four-digit year": function(format) {
-      var f = format("%Y");
-      assert.equal(f(local(123, 0, 1)), "0123");
-      assert.equal(f(local(1990, 0, 1)), "1990");
-      assert.equal(f(local(2002, 0, 1)), "2002");
-      assert.equal(f(local(10002, 0, 1)), "0002");
-      assert.equal(f(local(-2, 0, 1)), "-0002");
-    },
-    "formats time zone": function(format) {
-      var f = format("%Z");
-      assert.equal(f(local(1990, 0, 1)), "-0800");
-    },
-    "formats literal percent sign": function(format) {
-      var f = format("%%");
-      assert.equal(f(local(1990, 0, 1)), "%");
-    },
-
-    "multi": {
-      topic: function(format) {
-        return format.multi([
-          [".%L", function(d) { return d.getMilliseconds(); }],
-          [":%S", function(d) { return d.getSeconds(); }],
-          ["%I:%M", function(d) { return d.getMinutes(); }],
-          ["%a %d", function(d) { return d.getDay() && d.getDate() != 1; }],
-          ["%b %d", function(d) { return d.getDate() != 1; }],
-          ["%I %p", function(d) { return d.getHours(); }],
-          ["%B", function(d) { return d.getMonth(); }],
-          ["%Y", function() { return true; }]
-        ]);
-      },
-      "returns a multi-formatter using the predicated formats": function(f) {
-        assert.equal(f(local(1990, 0, 1, 1)), "01 AM");
-      },
-      "applies the first format for which the predicate returns true": function(f) {
-        assert.equal(f(local(1990, 0, 1, 0, 0, 0, 12)), ".012");
-        assert.equal(f(local(1990, 0, 1, 0, 0, 1)), ":01");
-        assert.equal(f(local(1990, 0, 1, 0, 1)), "12:01");
-        assert.equal(f(local(1990, 0, 2)), "Tue 02");
-        assert.equal(f(local(1990, 1, 1)), "February");
-        assert.equal(f(local(1990, 0, 1)), "1990");
-      }
-    },
-
-    "parse": {
-      "parses abbreviated weekday and numeric date": function(format) {
-        var p = format("%a %m/%d/%Y").parse;
-        assert.deepEqual(p("Sun 01/01/1990"), local(1990, 0, 1));
-        assert.deepEqual(p("Wed 02/03/1991"), local(1991, 1, 3));
-        assert.isNull(p("XXX 03/10/2010"));
-      },
-      "parses weekday and numeric date": function(format) {
-        var p = format("%A %m/%d/%Y").parse;
-        assert.deepEqual(p("Sunday 01/01/1990"), local(1990, 0, 1));
-        assert.deepEqual(p("Wednesday 02/03/1991"), local(1991, 1, 3));
-        assert.isNull(p("Caturday 03/10/2010"));
-      },
-     "parses abbreviated weekday, week number (Sunday) and year": function(format) {
-       var p = format("%a %U %Y").parse;
-       assert.deepEqual(p("Mon 00 1990"), local(1990, 0, 1));
-       assert.deepEqual(p("Sun 05 1991"), local(1991, 1, 3));
-       assert.deepEqual(p("Sun 01 1995"), local(1995, 0, 1));
-       assert.isNull(p("XXX 03 2010"));
-     },
-     "assumes Sunday when parsing week number (Sunday) with no weekday": function(format) {
-       var p = format("%U %Y").parse;
-       assert.deepEqual(p("00 1990"), local(1989, 11, 31));
-       assert.deepEqual(p("05 1991"), local(1991,  1,  3));
-       assert.deepEqual(p("01 1995"), local(1995,  0,  1));
-     },
-     "parses weekday, week number (Sunday) and year": function(format) {
-       var p = format("%A %U %Y").parse;
-       assert.deepEqual(p("Monday 00 1990"), local(1990, 0, 1));
-       assert.deepEqual(p("Sunday 05 1991"), local(1991, 1, 3));
-       assert.deepEqual(p("Sunday 01 1995"), local(1995, 0, 1));
-       assert.isNull(p("Caturday 03 2010"));
-     },
-     "parses numeric weekday, week number (Sunday) and year": function(format) {
-       var p = format("%w %U %Y").parse;
-       assert.deepEqual(p("1 00 1990"), local(1990, 0, 1));
-       assert.deepEqual(p("0 05 1991"), local(1991, 1, 3));
-       assert.deepEqual(p("0 01 1995"), local(1995, 0, 1));
-       assert.isNull(p("X 03 2010"));
-     },
-     "parses abbreviated weekday, week number (Monday) and year": function(format) {
-       var p = format("%a %W %Y").parse;
-       assert.deepEqual(p("Mon 01 1990"), local(1990, 0, 1));
-       assert.deepEqual(p("Sun 04 1991"), local(1991, 1, 3));
-       assert.deepEqual(p("Sun 00 1995"), local(1995, 0, 1));
-       assert.isNull(p("XXX 03 2010"));
-     },
-     "parses weekday, week number (Monday) and year": function(format) {
-       var p = format("%A %W %Y").parse;
-       assert.deepEqual(p("Monday 01 1990"), local(1990, 0, 1));
-       assert.deepEqual(p("Sunday 04 1991"), local(1991, 1, 3));
-       assert.deepEqual(p("Sunday 00 1995"), local(1995, 0, 1));
-       assert.isNull(p("Caturday 03 2010"));
-     },
-     "parses numeric weekday, week number (Monday) and year": function(format) {
-       var p = format("%w %W %Y").parse;
-       assert.deepEqual(p("1 01 1990"), local(1990, 0, 1));
-       assert.deepEqual(p("0 04 1991"), local(1991, 1, 3));
-       assert.deepEqual(p("0 00 1995"), local(1995, 0, 1));
-       assert.isNull(p("X 03 2010"));
-     },
-     "assumes Monday when parsing week number (Monday) with no weekday": function(format) {
-       var p = format("%W %Y").parse;
-       assert.deepEqual(p("01 1990"), local(1990, 0, 1));
-       assert.deepEqual(p("05 1991"), local(1991, 1, 4));
-       assert.deepEqual(p("01 1995"), local(1995, 0, 2));
-     },
-      "parses numeric date": function(format) {
-        var p = format("%m/%d/%y").parse;
-        assert.deepEqual(p("01/01/90"), local(1990, 0, 1));
-        assert.deepEqual(p("02/03/91"), local(1991, 1, 3));
-        assert.isNull(p("03/10/2010"));
-      },
-      "parses locale date": function(format) {
-        var p = format("%x").parse;
-        assert.deepEqual(p("01/01/1990"), local(1990, 0, 1));
-        assert.deepEqual(p("02/03/1991"), local(1991, 1, 3));
-        assert.deepEqual(p("03/10/2010"), local(2010, 2, 10));
-      },
-      "parses abbreviated month, date and year": function(format) {
-        var p = format("%b %d, %Y").parse;
-        assert.deepEqual(p("jan 01, 1990"), local(1990, 0, 1));
-        assert.deepEqual(p("feb  2, 2010"), local(2010, 1, 2));
-        assert.isNull(p("jan. 1, 1990"));
-      },
-      "parses month, date and year": function(format) {
-        var p = format("%B %d, %Y").parse;
-        assert.deepEqual(p("january 01, 1990"), local(1990, 0, 1));
-        assert.deepEqual(p("February  2, 2010"), local(2010, 1, 2));
-        assert.isNull(p("jan 1, 1990"));
-      },
-      "parses day of year and numeric date": function(format) {
-        var p = format("%j %m/%d/%Y").parse;
-        assert.deepEqual(p("001 01/01/1990"), local(1990, 0, 1));
-        assert.deepEqual(p("034 02/03/1991"), local(1991, 1, 3));
-        assert.isNull(p("2012 03/10/2010"));
-      },
-      "parses locale date and time": function(format) {
-        var p = format("%c").parse;
-        assert.deepEqual(p("Mon Jan  1 00:00:00 1990"), local(1990, 0, 1));
-        assert.deepEqual(p("Sun Jan  1 00:00:00 1990"), local(1990, 0, 1));
-        assert.deepEqual(p("Mon Jan 01 00:00:00 1990"), local(1990, 0, 1));
-        assert.deepEqual(p("Mon Jan 1 00:00:00 1990"), local(1990, 0, 1));
-        assert.deepEqual(p("Mon Jan 1 0:0:0 1990"), local(1990, 0, 1));
-      },
-      "parses twenty-four hour, minute and second": function(format) {
-        var p = format("%H:%M:%S").parse;
-        assert.deepEqual(p("00:00:00"), local(1900, 0, 1, 0, 0, 0));
-        assert.deepEqual(p("11:59:59"), local(1900, 0, 1, 11, 59, 59));
-        assert.deepEqual(p("12:00:00"), local(1900, 0, 1, 12, 0, 0));
-        assert.deepEqual(p("12:00:01"), local(1900, 0, 1, 12, 0, 1));
-        assert.deepEqual(p("23:59:59"), local(1900, 0, 1, 23, 59, 59));
-      },
-      "parses locale time": function(format) {
-        var p = format("%X").parse;
-        assert.deepEqual(p("00:00:00"), local(1900, 0, 1, 0, 0, 0));
-        assert.deepEqual(p("11:59:59"), local(1900, 0, 1, 11, 59, 59));
-        assert.deepEqual(p("12:00:00"), local(1900, 0, 1, 12, 0, 0));
-        assert.deepEqual(p("12:00:01"), local(1900, 0, 1, 12, 0, 1));
-        assert.deepEqual(p("23:59:59"), local(1900, 0, 1, 23, 59, 59));
-      },
-      "parses twelve hour, minute and second": function(format) {
-        var p = format("%I:%M:%S %p").parse;
-        assert.deepEqual(p("12:00:00 am"), local(1900, 0, 1, 0, 0, 0));
-        assert.deepEqual(p("11:59:59 AM"), local(1900, 0, 1, 11, 59, 59));
-        assert.deepEqual(p("12:00:00 pm"), local(1900, 0, 1, 12, 0, 0));
-        assert.deepEqual(p("12:00:01 pm"), local(1900, 0, 1, 12, 0, 1));
-        assert.deepEqual(p("11:59:59 PM"), local(1900, 0, 1, 23, 59, 59));
-      },
-      "parses literal %": function(format) {
-        var p = format("%% %m/%d/%Y").parse;
-        assert.deepEqual(p("% 01/01/1990"), local(1990, 0, 1));
-        assert.deepEqual(p("% 02/03/1991"), local(1991, 1, 3));
-        assert.isNull(p("%% 03/10/2010"));
-      },
-      "parses timezone offset": function(format) {
-        var p = format("%m/%d/%Y %Z").parse;
-        assert.deepEqual(p("01/02/1990 +0000"), local(1990, 0, 1, 16));
-        assert.deepEqual(p("01/02/1990 +0100"), local(1990, 0, 1, 15));
-        assert.deepEqual(p("01/02/1990 +0130"), local(1990, 0, 1, 14, 30));
-        assert.deepEqual(p("01/02/1990 -0100"), local(1990, 0, 1, 17));
-        assert.deepEqual(p("01/02/1990 -0130"), local(1990, 0, 1, 17, 30));
-        assert.deepEqual(p("01/02/1990 -0800"), local(1990, 0, 2, 0));
-      },
-      "ignores optional padding modifier, skipping zeroes and spaces": function(format) {
-        var p = format("%-m/%0d/%_Y").parse;
-        assert.deepEqual(p("01/ 1/1990"), local(1990, 0, 1));
-      },
-      "doesn't crash when given weird strings": function(format) {
-        try {
-          Object.prototype.foo = 10;
-          var p = format("%b %d, %Y").parse;
-          assert.isNull(p("foo 1, 1990"));
-        } finally {
-          delete Object.prototype.foo;
-        }
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/time/format-utc-test.js b/test/time/format-utc-test.js
deleted file mode 100644
index c8bfa547e75f7..0000000000000
--- a/test/time/format-utc-test.js
+++ /dev/null
@@ -1,226 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("./time"),
-    utc = time.utc;
-
-var suite = vows.describe("d3.time.format");
-
-suite.addBatch({
-  "format.utc": {
-    topic: load("time/format-utc").expression("d3.time.format.utc"),
-    "formats abbreviated weekday": function(format) {
-      var f = format("%a");
-      assert.equal(f(utc(1990, 0, 1)), "Mon");
-      assert.equal(f(utc(1990, 0, 2)), "Tue");
-      assert.equal(f(utc(1990, 0, 3)), "Wed");
-      assert.equal(f(utc(1990, 0, 4)), "Thu");
-      assert.equal(f(utc(1990, 0, 5)), "Fri");
-      assert.equal(f(utc(1990, 0, 6)), "Sat");
-      assert.equal(f(utc(1990, 0, 7)), "Sun");
-    },
-    "formats weekday": function(format) {
-      var f = format("%A");
-      assert.equal(f(utc(1990, 0, 1)), "Monday");
-      assert.equal(f(utc(1990, 0, 2)), "Tuesday");
-      assert.equal(f(utc(1990, 0, 3)), "Wednesday");
-      assert.equal(f(utc(1990, 0, 4)), "Thursday");
-      assert.equal(f(utc(1990, 0, 5)), "Friday");
-      assert.equal(f(utc(1990, 0, 6)), "Saturday");
-      assert.equal(f(utc(1990, 0, 7)), "Sunday");
-    },
-    "formats abbreviated month": function(format) {
-      var f = format("%b");
-      assert.equal(f(utc(1990, 0, 1)), "Jan");
-      assert.equal(f(utc(1990, 1, 1)), "Feb");
-      assert.equal(f(utc(1990, 2, 1)), "Mar");
-      assert.equal(f(utc(1990, 3, 1)), "Apr");
-      assert.equal(f(utc(1990, 4, 1)), "May");
-      assert.equal(f(utc(1990, 5, 1)), "Jun");
-      assert.equal(f(utc(1990, 6, 1)), "Jul");
-      assert.equal(f(utc(1990, 7, 1)), "Aug");
-      assert.equal(f(utc(1990, 8, 1)), "Sep");
-      assert.equal(f(utc(1990, 9, 1)), "Oct");
-      assert.equal(f(utc(1990, 10, 1)), "Nov");
-      assert.equal(f(utc(1990, 11, 1)), "Dec");
-    },
-    "formats locale date and time": function(format) {
-      var f = format("%c");
-      assert.equal(f(utc(1990, 0, 1)), "Mon Jan  1 00:00:00 1990");
-    },
-    "formats zero-padded date": function(format) {
-      var f = format("%d");
-      assert.equal(f(utc(1990, 0, 1)), "01");
-    },
-    "formats space-padded date": function(format) {
-      var f = format("%e");
-      assert.equal(f(utc(1990, 0, 1)), " 1");
-    },
-    "formats zero-padded hour (24)": function(format) {
-      var f = format("%H");
-      assert.equal(f(utc(1990, 0, 1, 0)), "00");
-      assert.equal(f(utc(1990, 0, 1, 13)), "13");
-    },
-    "formats zero-padded hour (12)": function(format) {
-      var f = format("%I");
-      assert.equal(f(utc(1990, 0, 1, 0)), "12");
-      assert.equal(f(utc(1990, 0, 1, 13)), "01");
-    },
-    "formats zero-padded day of year": function(format) {
-      var f = format("%j");
-      assert.equal(f(utc(1990, 0, 1)), "001");
-      assert.equal(f(utc(1990, 5, 1)), "152");
-      assert.equal(f(utc(2010, 2, 13, 23)), "072");
-      assert.equal(f(utc(2010, 2, 14, 00)), "073"); // DST begins
-      assert.equal(f(utc(2010, 2, 15, 00)), "074");
-      assert.equal(f(utc(2010, 10, 6, 23)), "310");
-      assert.equal(f(utc(2010, 10, 7, 00)), "311"); // DST ends
-      assert.equal(f(utc(2010, 10, 8, 00)), "312");
-    },
-    "formats zero-padded month": function(format) {
-      var f = format("%m");
-      assert.equal(f(utc(1990, 0, 1)), "01");
-      assert.equal(f(utc(1990, 9, 1)), "10");
-    },
-    "formats zero-padded minute": function(format) {
-      var f = format("%M");
-      assert.equal(f(utc(1990, 0, 1, 0, 0)), "00");
-      assert.equal(f(utc(1990, 0, 1, 0, 32)), "32");
-    },
-    "formats AM or PM": function(format) {
-      var f = format("%p");
-      assert.equal(f(utc(1990, 0, 1, 0)), "AM");
-      assert.equal(f(utc(1990, 0, 1, 13)), "PM");
-    },
-    "formats zero-padded second": function(format) {
-      var f = format("%S");
-      assert.equal(f(utc(1990, 0, 1, 0, 0, 0)), "00");
-      assert.equal(f(utc(1990, 0, 1, 0, 0, 32)), "32");
-    },
-    "formats zero-padded millisecond": function(format) {
-      var f = format("%L");
-      assert.equal(f(utc(1990, 0, 1, 0, 0, 0, 0)), "000");
-      assert.equal(f(utc(1990, 0, 1, 0, 0, 0, 432)), "432");
-    },
-    "formats zero-padded week number": function(format) {
-      var f = format("%U");
-      assert.equal(f(utc(1990, 0, 1)), "00");
-      assert.equal(f(utc(1990, 5, 1)), "21");
-      assert.equal(f(utc(2010, 2, 13, 23)), "10");
-      assert.equal(f(utc(2010, 2, 14, 00)), "11"); // DST begins
-      assert.equal(f(utc(2010, 2, 15, 00)), "11");
-      assert.equal(f(utc(2010, 10, 6, 23)), "44");
-      assert.equal(f(utc(2010, 10, 7, 00)), "45"); // DST ends
-      assert.equal(f(utc(2010, 10, 8, 00)), "45");
-    },
-    "formats locale date": function(format) {
-      var f = format("%x");
-      assert.equal(f(utc(1990, 0, 1)), "01/01/1990");
-      assert.equal(f(utc(2010, 5, 1)), "06/01/2010");
-    },
-    "formats locale time": function(format) {
-      var f = format("%X");
-      assert.equal(f(utc(1990, 0, 1)), "00:00:00");
-      assert.equal(f(utc(1990, 0, 1, 13, 34, 59)), "13:34:59");
-    },
-    "formats zero-padded two-digit year": function(format) {
-      var f = format("%y");
-      assert.equal(f(utc(1990, 0, 1)), "90");
-      assert.equal(f(utc(2002, 0, 1)), "02");
-    },
-    "formats zero-padded four-digit year": function(format) {
-      var f = format("%Y");
-      assert.equal(f(utc(123, 0, 1)), "0123");
-      assert.equal(f(utc(1990, 0, 1)), "1990");
-      assert.equal(f(utc(2002, 0, 1)), "2002");
-      assert.equal(f(utc(10002, 0, 1)), "0002");
-    },
-    "formats time zone": function(format) {
-      var f = format("%Z");
-      assert.equal(f(utc(1990, 0, 1)), "+0000");
-    },
-    "formats literal percent sign": function(format) {
-      var f = format("%%");
-      assert.equal(f(utc(1990, 0, 1)), "%");
-    },
-    "parse": {
-      "parses abbreviated weekday and numeric date": function(format) {
-        var p = format("%a %m/%d/%Y").parse;
-        assert.deepEqual(p("Sun 01/01/1990"), utc(1990, 0, 1));
-        assert.deepEqual(p("Wed 02/03/1991"), utc(1991, 1, 3));
-        assert.isNull(p("XXX 03/10/2010"));
-      },
-      "parses weekday and numeric date": function(format) {
-        var p = format("%A %m/%d/%Y").parse;
-        assert.deepEqual(p("Sunday 01/01/1990"), utc(1990, 0, 1));
-        assert.deepEqual(p("Wednesday 02/03/1991"), utc(1991, 1, 3));
-        assert.isNull(p("Caturday 03/10/2010"));
-      },
-      "parses numeric date": function(format) {
-        var p = format("%m/%d/%y").parse;
-        assert.deepEqual(p("01/01/90"), utc(1990, 0, 1));
-        assert.deepEqual(p("02/03/91"), utc(1991, 1, 3));
-        assert.isNull(p("03/10/2010"));
-      },
-      "parses locale date": function(format) {
-        var p = format("%x").parse;
-        assert.deepEqual(p("01/01/1990"), utc(1990, 0, 1));
-        assert.deepEqual(p("02/03/1991"), utc(1991, 1, 3));
-        assert.deepEqual(p("03/10/2010"), utc(2010, 2, 10));
-      },
-      "parses abbreviated month, date and year": function(format) {
-        var p = format("%b %d, %Y").parse;
-        assert.deepEqual(p("jan 01, 1990"), utc(1990, 0, 1));
-        assert.deepEqual(p("feb  2, 2010"), utc(2010, 1, 2));
-        assert.isNull(p("jan. 1, 1990"));
-      },
-      "parses month, date and year": function(format) {
-        var p = format("%B %d, %Y").parse;
-        assert.deepEqual(p("january 01, 1990"), utc(1990, 0, 1));
-        assert.deepEqual(p("February  2, 2010"), utc(2010, 1, 2));
-        assert.isNull(p("jan 1, 1990"));
-      },
-      "parses locale date and time": function(format) {
-        var p = format("%c").parse;
-        assert.deepEqual(p("Mon Jan  1 00:00:00 1990"), utc(1990, 0, 1));
-        assert.deepEqual(p("Sun Jan  1 00:00:00 1990"), utc(1990, 0, 1));
-        assert.deepEqual(p("Mon Jan 01 00:00:00 1990"), utc(1990, 0, 1));
-        assert.deepEqual(p("Mon Jan 1 00:00:00 1990"), utc(1990, 0, 1));
-        assert.deepEqual(p("Mon Jan 1 0:0:0 1990"), utc(1990, 0, 1));
-      },
-      "parses twenty-four hour, minute and second": function(format) {
-        var p = format("%H:%M:%S").parse;
-        assert.deepEqual(p("00:00:00"), utc(1900, 0, 1, 0, 0, 0));
-        assert.deepEqual(p("11:59:59"), utc(1900, 0, 1, 11, 59, 59));
-        assert.deepEqual(p("12:00:00"), utc(1900, 0, 1, 12, 0, 0));
-        assert.deepEqual(p("12:00:01"), utc(1900, 0, 1, 12, 0, 1));
-        assert.deepEqual(p("23:59:59"), utc(1900, 0, 1, 23, 59, 59));
-      },
-      "parses locale time": function(format) {
-        var p = format("%X").parse;
-        assert.deepEqual(p("00:00:00"), utc(1900, 0, 1, 0, 0, 0));
-        assert.deepEqual(p("11:59:59"), utc(1900, 0, 1, 11, 59, 59));
-        assert.deepEqual(p("12:00:00"), utc(1900, 0, 1, 12, 0, 0));
-        assert.deepEqual(p("12:00:01"), utc(1900, 0, 1, 12, 0, 1));
-        assert.deepEqual(p("23:59:59"), utc(1900, 0, 1, 23, 59, 59));
-      },
-      "parses twelve hour, minute and second": function(format) {
-        var p = format("%I:%M:%S %p").parse;
-        assert.deepEqual(p("12:00:00 am"), utc(1900, 0, 1, 0, 0, 0));
-        assert.deepEqual(p("11:59:59 AM"), utc(1900, 0, 1, 11, 59, 59));
-        assert.deepEqual(p("12:00:00 pm"), utc(1900, 0, 1, 12, 0, 0));
-        assert.deepEqual(p("12:00:01 pm"), utc(1900, 0, 1, 12, 0, 1));
-        assert.deepEqual(p("11:59:59 PM"), utc(1900, 0, 1, 23, 59, 59));
-      },
-      "parses timezone offset": function(format) {
-        var p = format("%m/%d/%Y %Z").parse;
-        assert.deepEqual(p("01/02/1990 +0000"), utc(1990, 0, 2));
-        assert.deepEqual(p("01/02/1990 +0100"), utc(1990, 0, 1, 23));
-        assert.deepEqual(p("01/02/1990 -0100"), utc(1990, 0, 2, 1));
-        assert.deepEqual(p("01/02/1990 -0800"), time.local(1990, 0, 2));
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/time/hour-test.js b/test/time/hour-test.js
deleted file mode 100644
index 757ae2267f953..0000000000000
--- a/test/time/hour-test.js
+++ /dev/null
@@ -1,215 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("./time"),
-    local = time.local,
-    utc = time.utc;
-
-var suite = vows.describe("d3.time.hour");
-
-suite.addBatch({
-  "hour": {
-    topic: load("time/hour").expression("d3.time.hour"),
-    "defaults to floor": function(interval) {
-      assert.strictEqual(interval, interval.floor);
-    },
-    "floor": {
-      topic: function(interval) {
-        return interval.floor;
-      },
-      "returns hours": function(floor) {
-        assert.deepEqual(floor(local(2010, 11, 31, 23, 59)), local(2010, 11, 31, 23));
-        assert.deepEqual(floor(local(2011, 00, 01, 00, 00)), local(2011, 00, 01, 00));
-        assert.deepEqual(floor(local(2011, 00, 01, 00, 01)), local(2011, 00, 01, 00));
-      },
-      "observes start of daylight savings time": function(floor) {
-        assert.deepEqual(floor(utc(2011, 02, 13, 08, 59)), utc(2011, 02, 13, 08));
-        assert.deepEqual(floor(utc(2011, 02, 13, 09, 00)), utc(2011, 02, 13, 09));
-        assert.deepEqual(floor(utc(2011, 02, 13, 09, 01)), utc(2011, 02, 13, 09));
-        assert.deepEqual(floor(utc(2011, 02, 13, 09, 59)), utc(2011, 02, 13, 09));
-        assert.deepEqual(floor(utc(2011, 02, 13, 10, 00)), utc(2011, 02, 13, 10));
-        assert.deepEqual(floor(utc(2011, 02, 13, 10, 01)), utc(2011, 02, 13, 10));
-      },
-      "observes end of daylight savings time": function(floor) {
-        assert.deepEqual(floor(utc(2011, 10, 06, 07, 59)), utc(2011, 10, 06, 07));
-        assert.deepEqual(floor(utc(2011, 10, 06, 08, 00)), utc(2011, 10, 06, 08));
-        assert.deepEqual(floor(utc(2011, 10, 06, 08, 01)), utc(2011, 10, 06, 08));
-        assert.deepEqual(floor(utc(2011, 10, 06, 08, 59)), utc(2011, 10, 06, 08));
-        assert.deepEqual(floor(utc(2011, 10, 06, 09, 00)), utc(2011, 10, 06, 09));
-        assert.deepEqual(floor(utc(2011, 10, 06, 09, 01)), utc(2011, 10, 06, 09));
-      },
-      "NPT": {
-        "observes 15-minute offset": time.zone(345, function(floor) {
-          assert.deepEqual(floor(local(2010, 11, 31, 23, 59, 59)), utc(2010, 11, 31, 17, 15));
-          assert.deepEqual(floor(local(2011, 00, 01, 00, 00, 00)), utc(2010, 11, 31, 18, 15));
-          assert.deepEqual(floor(local(2011, 00, 01, 00, 00, 01)), utc(2010, 11, 31, 18, 15));
-        })
-      },
-      "IST": {
-        "observes 30-minute offset": time.zone(330, function(floor) {
-          assert.deepEqual(floor(local(2010, 11, 31, 23, 59, 59)), utc(2010, 11, 31, 17, 30));
-          assert.deepEqual(floor(local(2011, 00, 01, 00, 00, 00)), utc(2010, 11, 31, 18, 30));
-          assert.deepEqual(floor(local(2011, 00, 01, 00, 00, 01)), utc(2010, 11, 31, 18, 30));
-        })
-      }
-    },
-    "ceil": {
-      topic: function(interval) {
-        return interval.ceil;
-      },
-      "returns hours": function(ceil) {
-        assert.deepEqual(ceil(local(2010, 11, 31, 23, 59)), local(2011, 00, 01, 00));
-        assert.deepEqual(ceil(local(2011, 00, 01, 00, 00)), local(2011, 00, 01, 00));
-        assert.deepEqual(ceil(local(2011, 00, 01, 00, 01)), local(2011, 00, 01, 01));
-      },
-      "observes start of daylight savings time": function(ceil) {
-        assert.deepEqual(ceil(utc(2011, 02, 13, 08, 59)), utc(2011, 02, 13, 09));
-        assert.deepEqual(ceil(utc(2011, 02, 13, 09, 00)), utc(2011, 02, 13, 09));
-        assert.deepEqual(ceil(utc(2011, 02, 13, 09, 01)), utc(2011, 02, 13, 10));
-        assert.deepEqual(ceil(utc(2011, 02, 13, 09, 59)), utc(2011, 02, 13, 10));
-        assert.deepEqual(ceil(utc(2011, 02, 13, 10, 00)), utc(2011, 02, 13, 10));
-        assert.deepEqual(ceil(utc(2011, 02, 13, 10, 01)), utc(2011, 02, 13, 11));
-      },
-      "observes end of daylight savings time": function(ceil) {
-        assert.deepEqual(ceil(utc(2011, 10, 06, 07, 59)), utc(2011, 10, 06, 08));
-        assert.deepEqual(ceil(utc(2011, 10, 06, 08, 00)), utc(2011, 10, 06, 08));
-        assert.deepEqual(ceil(utc(2011, 10, 06, 08, 01)), utc(2011, 10, 06, 09));
-        assert.deepEqual(ceil(utc(2011, 10, 06, 08, 59)), utc(2011, 10, 06, 09));
-        assert.deepEqual(ceil(utc(2011, 10, 06, 09, 00)), utc(2011, 10, 06, 09));
-        assert.deepEqual(ceil(utc(2011, 10, 06, 09, 01)), utc(2011, 10, 06, 10));
-      },
-      "NPT": {
-        "observes 15-minute offset": time.zone(345, function(ceil) {
-          assert.deepEqual(ceil(local(2010, 11, 31, 23, 59, 59)), utc(2010, 11, 31, 18, 15));
-          assert.deepEqual(ceil(local(2011, 00, 01, 00, 00, 00)), utc(2010, 11, 31, 18, 15));
-          assert.deepEqual(ceil(local(2011, 00, 01, 00, 00, 01)), utc(2010, 11, 31, 19, 15));
-        })
-      },
-      "IST": {
-        "observes 30-minute offset": time.zone(330, function(ceil) {
-          assert.deepEqual(ceil(local(2010, 11, 31, 23, 59, 59)), utc(2010, 11, 31, 18, 30));
-          assert.deepEqual(ceil(local(2011, 00, 01, 00, 00, 00)), utc(2010, 11, 31, 18, 30));
-          assert.deepEqual(ceil(local(2011, 00, 01, 00, 00, 01)), utc(2010, 11, 31, 19, 30));
-        })
-      }
-    },
-    "offset": {
-      topic: function(interval) {
-        return interval.offset;
-      },
-      "does not modify the passed-in date": function(offset) {
-        var date = local(2010, 11, 31, 23, 59, 59, 999);
-        offset(date, +1);
-        assert.deepEqual(date, local(2010, 11, 31, 23, 59, 59, 999));
-      },
-      "does not round the passed-in-date": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 999), +1), local(2011, 00, 01, 00, 59, 59, 999));
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 456), -2), local(2010, 11, 31, 21, 59, 59, 456));
-      },
-      "allows negative offsets": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 12), -1), local(2010, 11, 31, 11));
-        assert.deepEqual(offset(local(2011, 00, 01, 01), -2), local(2010, 11, 31, 23));
-        assert.deepEqual(offset(local(2011, 00, 01, 00), -1), local(2010, 11, 31, 23));
-      },
-      "allows positive offsets": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 11), +1), local(2010, 11, 31, 12));
-        assert.deepEqual(offset(local(2010, 11, 31, 23), +2), local(2011, 00, 01, 01));
-        assert.deepEqual(offset(local(2010, 11, 31, 23), +1), local(2011, 00, 01, 00));
-      },
-      "allows zero offset": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 999), 0), local(2010, 11, 31, 23, 59, 59, 999));
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 58, 000), 0), local(2010, 11, 31, 23, 59, 58, 000));
-      }
-    },
-    "UTC": {
-      topic: function(interval) {
-        return interval.utc;
-      },
-      "defaults to floor": function(interval) {
-        assert.strictEqual(interval, interval.floor);
-      },
-      "floor": {
-        topic: function(interval) {
-          return interval.floor;
-        },
-        "returns hours": function(floor) {
-          assert.deepEqual(floor(utc(2010, 11, 31, 23, 59)), utc(2010, 11, 31, 23));
-          assert.deepEqual(floor(utc(2011, 00, 01, 00, 00)), utc(2011, 00, 01, 00));
-          assert.deepEqual(floor(utc(2011, 00, 01, 00, 01)), utc(2011, 00, 01, 00));
-        },
-        "does not observe the start of daylight savings time": function(floor) {
-          assert.deepEqual(floor(utc(2011, 02, 13, 08, 59)), utc(2011, 02, 13, 08));
-          assert.deepEqual(floor(utc(2011, 02, 13, 09, 00)), utc(2011, 02, 13, 09));
-          assert.deepEqual(floor(utc(2011, 02, 13, 09, 01)), utc(2011, 02, 13, 09));
-          assert.deepEqual(floor(utc(2011, 02, 13, 09, 59)), utc(2011, 02, 13, 09));
-          assert.deepEqual(floor(utc(2011, 02, 13, 10, 00)), utc(2011, 02, 13, 10));
-          assert.deepEqual(floor(utc(2011, 02, 13, 10, 01)), utc(2011, 02, 13, 10));
-        },
-        "does not observe the end of daylight savings time": function(floor) {
-          assert.deepEqual(floor(utc(2011, 10, 06, 07, 59)), utc(2011, 10, 06, 07));
-          assert.deepEqual(floor(utc(2011, 10, 06, 08, 00)), utc(2011, 10, 06, 08));
-          assert.deepEqual(floor(utc(2011, 10, 06, 08, 01)), utc(2011, 10, 06, 08));
-          assert.deepEqual(floor(utc(2011, 10, 06, 08, 59)), utc(2011, 10, 06, 08));
-          assert.deepEqual(floor(utc(2011, 10, 06, 09, 00)), utc(2011, 10, 06, 09));
-          assert.deepEqual(floor(utc(2011, 10, 06, 09, 01)), utc(2011, 10, 06, 09));
-        }
-      },
-      "ceil": {
-        topic: function(interval) {
-          return interval.ceil;
-        },
-        "returns hours": function(ceil) {
-          assert.deepEqual(ceil(utc(2010, 11, 31, 23, 59)), utc(2011, 00, 01, 00));
-          assert.deepEqual(ceil(utc(2011, 00, 01, 00, 00)), utc(2011, 00, 01, 00));
-          assert.deepEqual(ceil(utc(2011, 00, 01, 00, 01)), utc(2011, 00, 01, 01));
-        },
-        "does not observe the start of daylight savings time": function(ceil) {
-          assert.deepEqual(ceil(utc(2011, 02, 13, 08, 59)), utc(2011, 02, 13, 09));
-          assert.deepEqual(ceil(utc(2011, 02, 13, 09, 00)), utc(2011, 02, 13, 09));
-          assert.deepEqual(ceil(utc(2011, 02, 13, 09, 01)), utc(2011, 02, 13, 10));
-          assert.deepEqual(ceil(utc(2011, 02, 13, 09, 59)), utc(2011, 02, 13, 10));
-          assert.deepEqual(ceil(utc(2011, 02, 13, 10, 00)), utc(2011, 02, 13, 10));
-          assert.deepEqual(ceil(utc(2011, 02, 13, 10, 01)), utc(2011, 02, 13, 11));
-        },
-        "does not observe the end of daylight savings time": function(ceil) {
-          assert.deepEqual(ceil(utc(2011, 10, 06, 07, 59)), utc(2011, 10, 06, 08));
-          assert.deepEqual(ceil(utc(2011, 10, 06, 08, 00)), utc(2011, 10, 06, 08));
-          assert.deepEqual(ceil(utc(2011, 10, 06, 08, 01)), utc(2011, 10, 06, 09));
-          assert.deepEqual(ceil(utc(2011, 10, 06, 08, 59)), utc(2011, 10, 06, 09));
-          assert.deepEqual(ceil(utc(2011, 10, 06, 09, 00)), utc(2011, 10, 06, 09));
-          assert.deepEqual(ceil(utc(2011, 10, 06, 09, 01)), utc(2011, 10, 06, 10));
-        }
-      },
-      "offset": {
-        topic: function(interval) {
-          return interval.offset;
-        },
-        "does not modify the passed-in date": function(offset) {
-          var date = utc(2010, 11, 31, 23, 59, 59, 999);
-          offset(date, +1);
-          assert.deepEqual(date, utc(2010, 11, 31, 23, 59, 59, 999));
-        },
-        "does not round the passed-in-date": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 999), +1), utc(2011, 00, 01, 00, 59, 59, 999));
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 456), -2), utc(2010, 11, 31, 21, 59, 59, 456));
-        },
-        "allows negative offsets": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31, 12), -1), utc(2010, 11, 31, 11));
-          assert.deepEqual(offset(utc(2011, 00, 01, 01), -2), utc(2010, 11, 31, 23));
-          assert.deepEqual(offset(utc(2011, 00, 01, 00), -1), utc(2010, 11, 31, 23));
-        },
-        "allows positive offsets": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31, 11), +1), utc(2010, 11, 31, 12));
-          assert.deepEqual(offset(utc(2010, 11, 31, 23), +2), utc(2011, 00, 01, 01));
-          assert.deepEqual(offset(utc(2010, 11, 31, 23), +1), utc(2011, 00, 01, 00));
-        },
-        "allows zero offset": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 999), 0), utc(2010, 11, 31, 23, 59, 59, 999));
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 58, 000), 0), utc(2010, 11, 31, 23, 59, 58, 000));
-        }
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/time/hours-test.js b/test/time/hours-test.js
deleted file mode 100644
index c0a6a767cde3b..0000000000000
--- a/test/time/hours-test.js
+++ /dev/null
@@ -1,109 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("./time"),
-    local = time.local,
-    utc = time.utc;
-
-var suite = vows.describe("d3.time.hours");
-
-suite.addBatch({
-  "hours": {
-    topic: load("time/hour").expression("d3.time.hours"),
-    "returns hours": function(range) {
-      assert.deepEqual(range(local(2010, 11, 31, 12, 30), local(2010, 11, 31, 15, 30)), [
-        local(2010, 11, 31, 13),
-        local(2010, 11, 31, 14),
-        local(2010, 11, 31, 15)
-      ]);
-    },
-    "has an inclusive lower bound": function(range) {
-      assert.deepEqual(range(local(2010, 11, 31, 23), local(2011, 0, 1, 2))[0], local(2010, 11, 31, 23));
-    },
-    "has an exclusive upper bound": function(range) {
-      assert.deepEqual(range(local(2010, 11, 31, 23), local(2011, 0, 1, 2))[2], local(2011, 0, 1, 1));
-    },
-    "can skip hours": function(range) {
-      assert.deepEqual(range(local(2011, 1, 1, 1), local(2011, 1, 1, 13), 3), [
-        local(2011, 1, 1, 3),
-        local(2011, 1, 1, 6),
-        local(2011, 1, 1, 9),
-        local(2011, 1, 1, 12)
-      ]);
-    },
-    "observes start of daylight savings time": function(range) {
-      assert.deepEqual(range(local(2011, 2, 13, 1), local(2011, 2, 13, 5)), [
-        utc(2011, 2, 13, 9),
-        utc(2011, 2, 13, 10),
-        utc(2011, 2, 13, 11)
-      ]);
-    },
-    "observes end of daylight savings time": function(range) {
-      assert.deepEqual(range(local(2011, 10, 6, 0), local(2011, 10, 6, 2)), [
-        utc(2011, 10, 6, 7),
-        utc(2011, 10, 6, 8),
-        utc(2011, 10, 6, 9)
-      ]);
-    },
-    "NPT": {
-      "observes 15-minute offset": time.zone(345, function(range) {
-        assert.deepEqual(range(local(2011, 10, 7, 0), local(2011, 10, 7, 3)), [
-          utc(2011, 10, 6, 18, 15),
-          utc(2011, 10, 6, 19, 15),
-          utc(2011, 10, 6, 20, 15)
-        ]);
-      })
-    },
-    "IST": {
-      "observes 30-minute offset": time.zone(330, function(range) {
-        assert.deepEqual(range(local(2011, 10, 7, 0), local(2011, 10, 7, 3)), [
-          utc(2011, 10, 6, 18, 30),
-          utc(2011, 10, 6, 19, 30),
-          utc(2011, 10, 6, 20, 30)
-        ]);
-      })
-    },
-    "UTC": {
-      topic: function(range) {
-        return range.utc;
-      },
-      "returns hours": function(range) {
-        assert.deepEqual(range(utc(2010, 11, 31, 12, 30), utc(2010, 11, 31, 15, 30)), [
-          utc(2010, 11, 31, 13),
-          utc(2010, 11, 31, 14),
-          utc(2010, 11, 31, 15)
-        ]);
-      },
-      "has an inclusive lower bound": function(range) {
-        assert.deepEqual(range(utc(2010, 11, 31, 23), utc(2011, 0, 1, 2))[0], utc(2010, 11, 31, 23));
-      },
-      "has an exclusive upper bound": function(range) {
-        assert.deepEqual(range(utc(2010, 11, 31, 23), utc(2011, 0, 1, 2))[2], utc(2011, 0, 1, 1));
-      },
-      "can skip hours": function(range) {
-        assert.deepEqual(range(utc(2011, 1, 1, 1), utc(2011, 1, 1, 13), 3), [
-          utc(2011, 1, 1, 3),
-          utc(2011, 1, 1, 6),
-          utc(2011, 1, 1, 9),
-          utc(2011, 1, 1, 12)
-        ]);
-      },
-      "observes start of daylight savings time": function(range) {
-        assert.deepEqual(range(utc(2011, 2, 13, 9), utc(2011, 2, 13, 12)), [
-          utc(2011, 2, 13, 9),
-          utc(2011, 2, 13, 10),
-          utc(2011, 2, 13, 11)
-        ]);
-      },
-      "observes end of daylight savings time": function(range) {
-        assert.deepEqual(range(utc(2011, 10, 6, 7), utc(2011, 10, 6, 10)), [
-          utc(2011, 10, 6, 7),
-          utc(2011, 10, 6, 8),
-          utc(2011, 10, 6, 9)
-        ]);
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/time/minute-test.js b/test/time/minute-test.js
deleted file mode 100644
index e3a3c3c2c0608..0000000000000
--- a/test/time/minute-test.js
+++ /dev/null
@@ -1,127 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("./time"),
-    local = time.local,
-    utc = time.utc;
-
-var suite = vows.describe("d3.time.minute");
-
-suite.addBatch({
-  "minute": {
-    topic: load("time/minute").expression("d3.time.minute"),
-    "defaults to floor": function(interval) {
-      assert.strictEqual(interval, interval.floor);
-    },
-    "floor": {
-      topic: function(interval) {
-        return interval.floor;
-      },
-      "returns minutes": function(floor) {
-        assert.deepEqual(floor(local(2010, 11, 31, 23, 59, 59)), local(2010, 11, 31, 23, 59));
-        assert.deepEqual(floor(local(2011, 00, 01, 00, 00, 00)), local(2011, 00, 01, 00, 00));
-        assert.deepEqual(floor(local(2011, 00, 01, 00, 00, 59)), local(2011, 00, 01, 00, 00));
-        assert.deepEqual(floor(local(2011, 00, 01, 00, 01, 00)), local(2011, 00, 01, 00, 01));
-      }
-    },
-    "ceil": {
-      topic: function(interval) {
-        return interval.ceil;
-      },
-      "returns minutes": function(ceil) {
-        assert.deepEqual(ceil(local(2010, 11, 31, 23, 59, 59)), local(2011, 00, 01, 00, 00));
-        assert.deepEqual(ceil(local(2011, 00, 01, 00, 00, 00)), local(2011, 00, 01, 00, 00));
-        assert.deepEqual(ceil(local(2011, 00, 01, 00, 00, 59)), local(2011, 00, 01, 00, 01));
-        assert.deepEqual(ceil(local(2011, 00, 01, 00, 01, 00)), local(2011, 00, 01, 00, 01));
-      }
-    },
-    "offset": {
-      topic: function(interval) {
-        return interval.offset;
-      },
-      "does not modify the passed-in date": function(offset) {
-        var date = local(2010, 11, 31, 23, 59, 59, 999);
-        offset(date, +1);
-        assert.deepEqual(date, local(2010, 11, 31, 23, 59, 59, 999));
-      },
-      "does not round the passed-in-date": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 999), +1), local(2011, 00, 01, 00, 00, 59, 999));
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 456), -2), local(2010, 11, 31, 23, 57, 59, 456));
-      },
-      "allows negative offsets": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 12), -1), local(2010, 11, 31, 23, 11));
-        assert.deepEqual(offset(local(2011, 00, 01, 00, 01), -2), local(2010, 11, 31, 23, 59));
-        assert.deepEqual(offset(local(2011, 00, 01, 00, 00), -1), local(2010, 11, 31, 23, 59));
-      },
-      "allows positive offsets": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 11), +1), local(2010, 11, 31, 23, 12));
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59), +2), local(2011, 00, 01, 00, 01));
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59), +1), local(2011, 00, 01, 00, 00));
-      },
-      "allows zero offset": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 999), 0), local(2010, 11, 31, 23, 59, 59, 999));
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 58, 000), 0), local(2010, 11, 31, 23, 59, 58, 000));
-      }
-    },
-    "UTC": {
-      topic: function(interval) {
-        return interval.utc;
-      },
-      "defaults to floor": function(interval) {
-        assert.strictEqual(interval, interval.floor);
-      },
-      "floor": {
-        topic: function(interval) {
-          return interval.floor;
-        },
-        "returns minutes": function(floor) {
-          assert.deepEqual(floor(utc(2010, 11, 31, 23, 59, 59)), utc(2010, 11, 31, 23, 59));
-          assert.deepEqual(floor(utc(2011, 00, 01, 00, 00, 00)), utc(2011, 00, 01, 00, 00));
-          assert.deepEqual(floor(utc(2011, 00, 01, 00, 00, 59)), utc(2011, 00, 01, 00, 00));
-          assert.deepEqual(floor(utc(2011, 00, 01, 00, 01, 00)), utc(2011, 00, 01, 00, 01));
-        }
-      },
-      "ceil": {
-        topic: function(interval) {
-          return interval.ceil;
-        },
-        "returns minutes": function(ceil) {
-          assert.deepEqual(ceil(utc(2010, 11, 31, 23, 59, 59)), utc(2011, 00, 01, 00, 00));
-          assert.deepEqual(ceil(utc(2011, 00, 01, 00, 00, 00)), utc(2011, 00, 01, 00, 00));
-          assert.deepEqual(ceil(utc(2011, 00, 01, 00, 00, 59)), utc(2011, 00, 01, 00, 01));
-          assert.deepEqual(ceil(utc(2011, 00, 01, 00, 01, 00)), utc(2011, 00, 01, 00, 01));
-        }
-      },
-      "offset": {
-        topic: function(interval) {
-          return interval.offset;
-        },
-        "does not modify the passed-in date": function(offset) {
-          var date = utc(2010, 11, 31, 23, 59, 59, 999);
-          offset(date, +1);
-          assert.deepEqual(date, utc(2010, 11, 31, 23, 59, 59, 999));
-        },
-        "does not round the passed-in-date": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 999), +1), utc(2011, 00, 01, 00, 00, 59, 999));
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 456), -2), utc(2010, 11, 31, 23, 57, 59, 456));
-        },
-        "allows negative offsets": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 12), -1), utc(2010, 11, 31, 23, 11));
-          assert.deepEqual(offset(utc(2011, 00, 01, 00, 01), -2), utc(2010, 11, 31, 23, 59));
-          assert.deepEqual(offset(utc(2011, 00, 01, 00, 00), -1), utc(2010, 11, 31, 23, 59));
-        },
-        "allows positive offsets": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 11), +1), utc(2010, 11, 31, 23, 12));
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59), +2), utc(2011, 00, 01, 00, 01));
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59), +1), utc(2011, 00, 01, 00, 00));
-        },
-        "allows zero offset": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 999), 0), utc(2010, 11, 31, 23, 59, 59, 999));
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 58, 000), 0), utc(2010, 11, 31, 23, 59, 58, 000));
-        }
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/time/minutes-test.js b/test/time/minutes-test.js
deleted file mode 100644
index 1d176bfcd3795..0000000000000
--- a/test/time/minutes-test.js
+++ /dev/null
@@ -1,91 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("./time"),
-    local = time.local,
-    utc = time.utc;
-
-var suite = vows.describe("d3.time.minutes");
-
-suite.addBatch({
-  "minutes": {
-    topic: load("time/minute").expression("d3.time.minutes"),
-    "returns minutes": function(range) {
-      assert.deepEqual(range(local(2010, 11, 31, 23, 59), local(2011, 0, 1, 0, 2)), [
-        local(2010, 11, 31, 23, 59),
-        local(2011, 0, 1, 0, 0),
-        local(2011, 0, 1, 0, 1)
-      ]);
-    },
-    "has an inclusive lower bound": function(range) {
-      assert.deepEqual(range(local(2010, 11, 31, 23, 59), local(2011, 0, 1, 0, 2))[0], local(2010, 11, 31, 23, 59));
-    },
-    "has an exclusive upper bound": function(range) {
-      assert.deepEqual(range(local(2010, 11, 31, 23, 59), local(2011, 0, 1, 0, 2))[2], local(2011, 0, 1, 0, 1));
-    },
-    "can skip minutes": function(range) {
-      assert.deepEqual(range(local(2011, 1, 1, 12, 7), local(2011, 1, 1, 13, 7), 15), [
-        local(2011, 1, 1, 12, 15),
-        local(2011, 1, 1, 12, 30),
-        local(2011, 1, 1, 12, 45),
-        local(2011, 1, 1, 13, 0)
-      ]);
-    },
-    "observes start of daylight savings time": function(range) {
-      assert.deepEqual(range(utc(2011, 2, 13, 9, 59), utc(2011, 2, 13, 10, 2)), [
-        utc(2011, 2, 13, 9, 59),
-        utc(2011, 2, 13, 10, 0),
-        utc(2011, 2, 13, 10, 1)
-      ]);
-    },
-    "observes end of daylight savings time": function(range) {
-      assert.deepEqual(range(utc(2011, 10, 6, 8, 59), utc(2011, 10, 6, 9, 2)), [
-        utc(2011, 10, 6, 8, 59),
-        utc(2011, 10, 6, 9, 0),
-        utc(2011, 10, 6, 9, 1)
-      ]);
-    },
-    "UTC": {
-      topic: function(range) {
-        return range.utc;
-      },
-      "returns minutes": function(range) {
-        assert.deepEqual(range(utc(2010, 11, 31, 23, 59), utc(2011, 0, 1, 0, 2)), [
-          utc(2010, 11, 31, 23, 59),
-          utc(2011, 0, 1, 0, 0),
-          utc(2011, 0, 1, 0, 1)
-        ]);
-      },
-      "has an inclusive lower bound": function(range) {
-        assert.deepEqual(range(utc(2010, 11, 31, 23, 59), utc(2011, 0, 1, 0, 2))[0], utc(2010, 11, 31, 23, 59));
-      },
-      "has an exclusive upper bound": function(range) {
-        assert.deepEqual(range(utc(2010, 11, 31, 23, 59), utc(2011, 0, 1, 0, 2))[2], utc(2011, 0, 1, 0, 1));
-      },
-      "can skip minutes": function(range) {
-        assert.deepEqual(range(utc(2011, 1, 1, 12, 7), utc(2011, 1, 1, 13, 7), 15), [
-          utc(2011, 1, 1, 12, 15),
-          utc(2011, 1, 1, 12, 30),
-          utc(2011, 1, 1, 12, 45),
-          utc(2011, 1, 1, 13, 0)
-        ]);
-      },
-      "does not observe the start of daylight savings time": function(range) {
-        assert.deepEqual(range(utc(2011, 2, 13, 9, 59), utc(2011, 2, 13, 10, 2)), [
-          utc(2011, 2, 13, 9, 59),
-          utc(2011, 2, 13, 10, 0),
-          utc(2011, 2, 13, 10, 1)
-        ]);
-      },
-      "does not observe the end of daylight savings time": function(range) {
-        assert.deepEqual(range(utc(2011, 10, 6, 8, 59), utc(2011, 10, 6, 9, 2)), [
-          utc(2011, 10, 6, 8, 59),
-          utc(2011, 10, 6, 9, 0),
-          utc(2011, 10, 6, 9, 1)
-        ]);
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/time/month-test.js b/test/time/month-test.js
deleted file mode 100644
index 10f349df70731..0000000000000
--- a/test/time/month-test.js
+++ /dev/null
@@ -1,150 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("./time"),
-    local = time.local,
-    utc = time.utc;
-
-var suite = vows.describe("d3.time.month");
-
-suite.addBatch({
-  "month": {
-    topic: load("time/month").expression("d3.time.month"),
-    "defaults to floor": function(interval) {
-      assert.strictEqual(interval, interval.floor);
-    },
-    "floor": {
-      topic: function(interval) {
-        return interval.floor;
-      },
-      "returns months": function(floor) {
-        assert.deepEqual(floor(local(2010, 11, 31, 23, 59, 59)), local(2010, 11, 01));
-        assert.deepEqual(floor(local(2011, 00, 01, 00, 00, 00)), local(2011, 00, 01));
-        assert.deepEqual(floor(local(2011, 00, 01, 00, 00, 01)), local(2011, 00, 01));
-      },
-      "observes the start of daylight savings time": function(floor) {
-        assert.deepEqual(floor(local(2011, 02, 13, 01)), local(2011, 02, 01));
-      },
-      "observes the end of the daylight savings time": function(floor) {
-        assert.deepEqual(floor(local(2011, 10, 06, 01)), local(2011, 10, 01));
-      },
-      "correctly handles years in the first century": function(floor) {
-        assert.deepEqual(floor(local(0011, 10, 06, 07)), local(0011, 10, 01));
-      }
-    },
-    "ceil": {
-      topic: function(interval) {
-        return interval.ceil;
-      },
-      "returns months": function(ceil) {
-        assert.deepEqual(ceil(local(2010, 11, 31, 23, 59, 59)), local(2011, 00, 01));
-        assert.deepEqual(ceil(local(2011, 00, 01, 00, 00, 00)), local(2011, 00, 01));
-        assert.deepEqual(ceil(local(2011, 00, 01, 00, 00, 01)), local(2011, 01, 01));
-      },
-      "observes the start of daylight savings time": function(ceil) {
-        assert.deepEqual(ceil(local(2011, 02, 13, 01)), local(2011, 03, 01));
-      },
-      "observes the end of the daylight savings time": function(ceil) {
-        assert.deepEqual(ceil(local(2011, 10, 06, 01)), local(2011, 11, 01));
-      }
-    },
-    "offset": {
-      topic: function(interval) {
-        return interval.offset;
-      },
-      "does not modify the passed-in date": function(offset) {
-        var date = local(2010, 11, 31, 23, 59, 59, 999);
-        offset(date, +1);
-        assert.deepEqual(date, local(2010, 11, 31, 23, 59, 59, 999));
-      },
-      "does not round the passed-in-date": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 999), +1), local(2011, 00, 31, 23, 59, 59, 999));
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 456), -2), local(2010, 09, 31, 23, 59, 59, 456));
-      },
-      "allows negative offsets": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 01), -1), local(2010, 10, 01));
-        assert.deepEqual(offset(local(2011, 00, 01), -2), local(2010, 10, 01));
-        assert.deepEqual(offset(local(2011, 00, 01), -1), local(2010, 11, 01));
-      },
-      "allows positive offsets": function(offset) {
-        assert.deepEqual(offset(local(2010, 10, 01), +1), local(2010, 11, 01));
-        assert.deepEqual(offset(local(2010, 10, 01), +2), local(2011, 00, 01));
-        assert.deepEqual(offset(local(2010, 11, 01), +1), local(2011, 00, 01));
-      },
-      "allows zero offset": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 999), 0), local(2010, 11, 31, 23, 59, 59, 999));
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 58, 000), 0), local(2010, 11, 31, 23, 59, 58, 000));
-      }
-    },
-    "UTC": {
-      topic: function(interval) {
-        return interval.utc;
-      },
-      "defaults to floor": function(interval) {
-        assert.strictEqual(interval, interval.floor);
-      },
-      "floor": {
-        topic: function(interval) {
-          return interval.floor;
-        },
-        "returns months": function(floor) {
-          assert.deepEqual(floor(utc(2010, 11, 31, 23, 59, 59)), utc(2010, 11, 01));
-          assert.deepEqual(floor(utc(2011, 00, 01, 00, 00, 00)), utc(2011, 00, 01));
-          assert.deepEqual(floor(utc(2011, 00, 01, 00, 00, 01)), utc(2011, 00, 01));
-        },
-        "does not observe the start of daylight savings time": function(floor) {
-          assert.deepEqual(floor(utc(2011, 02, 13, 01)), utc(2011, 02, 01));
-        },
-        "does not observe the end of the daylight savings time": function(floor) {
-          assert.deepEqual(floor(utc(2011, 10, 06, 01)), utc(2011, 10, 01));
-        }
-      },
-      "ceil": {
-        topic: function(interval) {
-          return interval.ceil;
-        },
-        "returns months": function(ceil) {
-          assert.deepEqual(ceil(utc(2010, 11, 31, 23, 59, 59)), utc(2011, 00, 01));
-          assert.deepEqual(ceil(utc(2011, 00, 01, 00, 00, 00)), utc(2011, 00, 01));
-          assert.deepEqual(ceil(utc(2011, 00, 01, 00, 00, 01)), utc(2011, 01, 01));
-        },
-        "does not observe the start of daylight savings time": function(ceil) {
-          assert.deepEqual(ceil(utc(2011, 02, 13, 01)), utc(2011, 03, 01));
-        },
-        "does not observe the end of the daylight savings time": function(ceil) {
-          assert.deepEqual(ceil(utc(2011, 10, 06, 01)), utc(2011, 11, 01));
-        }
-      },
-      "offset": {
-        topic: function(interval) {
-          return interval.offset;
-        },
-        "does not modify the passed-in date": function(offset) {
-          var date = utc(2010, 11, 31, 23, 59, 59, 999);
-          offset(date, +1);
-          assert.deepEqual(date, utc(2010, 11, 31, 23, 59, 59, 999));
-        },
-        "does not round the passed-in-date": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 999), +1), utc(2011, 00, 31, 23, 59, 59, 999));
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 456), -2), utc(2010, 09, 31, 23, 59, 59, 456));
-        },
-        "allows negative offsets": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 01), -1), utc(2010, 10, 01));
-          assert.deepEqual(offset(utc(2011, 00, 01), -2), utc(2010, 10, 01));
-          assert.deepEqual(offset(utc(2011, 00, 01), -1), utc(2010, 11, 01));
-        },
-        "allows positive offsets": function(offset) {
-          assert.deepEqual(offset(utc(2010, 10, 01), +1), utc(2010, 11, 01));
-          assert.deepEqual(offset(utc(2010, 10, 01), +2), utc(2011, 00, 01));
-          assert.deepEqual(offset(utc(2010, 11, 01), +1), utc(2011, 00, 01));
-        },
-        "allows zero offset": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 999), 0), utc(2010, 11, 31, 23, 59, 59, 999));
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 58, 000), 0), utc(2010, 11, 31, 23, 59, 58, 000));
-        }
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/time/months-test.js b/test/time/months-test.js
deleted file mode 100644
index 82bca86baf819..0000000000000
--- a/test/time/months-test.js
+++ /dev/null
@@ -1,95 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("./time"),
-    local = time.local,
-    utc = time.utc;
-
-var suite = vows.describe("d3.time.months");
-
-suite.addBatch({
-  "months": {
-    topic: load("time/month").expression("d3.time.months"),
-    "returns months": function(range) {
-      assert.deepEqual(range(local(2010, 10, 31), local(2011, 2, 1)), [
-        local(2010, 11, 1),
-        local(2011, 0, 1),
-        local(2011, 1, 1)
-      ]);
-    },
-    "has an inclusive lower bound": function(range) {
-      assert.deepEqual(range(local(2010, 10, 31), local(2011, 2, 1))[0], local(2010, 11, 1));
-    },
-    "has an exclusive upper bound": function(range) {
-      assert.deepEqual(range(local(2010, 10, 31), local(2011, 2, 1))[2], local(2011, 1, 1));
-    },
-    "can skip months": function(range) {
-      assert.deepEqual(range(local(2011, 1, 1), local(2012, 1, 1), 3), [
-        local(2011, 3, 1),
-        local(2011, 6, 1),
-        local(2011, 9, 1),
-        local(2012, 0, 1)
-      ]);
-    },
-    "observes start of daylight savings time": function(range) {
-      assert.deepEqual(range(local(2011, 0, 1), local(2011, 4, 1)), [
-        local(2011, 0, 1),
-        local(2011, 1, 1),
-        local(2011, 2, 1),
-        local(2011, 3, 1)
-      ]);
-    },
-    "observes end of daylight savings time": function(range) {
-      assert.deepEqual(range(local(2011, 9, 1), local(2012, 1, 1)), [
-        local(2011, 9, 1),
-        local(2011, 10, 1),
-        local(2011, 11, 1),
-        local(2012, 0, 1)
-      ]);
-    },
-    "UTC": {
-      topic: function(range) {
-        return range.utc;
-      },
-      "returns months": function(range) {
-        assert.deepEqual(range(utc(2010, 10, 31), utc(2011, 2, 1)), [
-          utc(2010, 11, 1),
-          utc(2011, 0, 1),
-          utc(2011, 1, 1)
-        ]);
-      },
-      "has an inclusive lower bound": function(range) {
-        assert.deepEqual(range(utc(2010, 10, 31), utc(2011, 2, 1))[0], utc(2010, 11, 1));
-      },
-      "has an exclusive upper bound": function(range) {
-        assert.deepEqual(range(utc(2010, 10, 31), utc(2011, 2, 1))[2], utc(2011, 1, 1));
-      },
-      "can skip months": function(range) {
-        assert.deepEqual(range(utc(2011, 1, 1), utc(2012, 1, 1), 3), [
-          utc(2011, 3, 1),
-          utc(2011, 6, 1),
-          utc(2011, 9, 1),
-          utc(2012, 0, 1)
-        ]);
-      },
-      "does not observe the start of daylight savings time": function(range) {
-        assert.deepEqual(range(utc(2011, 0, 1), utc(2011, 4, 1)), [
-          utc(2011, 0, 1),
-          utc(2011, 1, 1),
-          utc(2011, 2, 1),
-          utc(2011, 3, 1)
-        ]);
-      },
-      "does not observe the end of daylight savings time": function(range) {
-        assert.deepEqual(range(utc(2011, 9, 1), utc(2012, 1, 1)), [
-          utc(2011, 9, 1),
-          utc(2011, 10, 1),
-          utc(2011, 11, 1),
-          utc(2012, 0, 1)
-        ]);
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/time/scale-test.js b/test/time/scale-test.js
deleted file mode 100644
index aeb258b78aecc..0000000000000
--- a/test/time/scale-test.js
+++ /dev/null
@@ -1,684 +0,0 @@
-var vows = require("vows"),
-    _ = require("../../"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("./time"),
-    local = time.local,
-    utc = time.utc;
-
-var suite = vows.describe("d3.time.scale");
-
-suite.addBatch({
-  "scale": {
-    topic: load("time/scale").expression("d3.time.scale").document(),
-
-    "nice": {
-      "rounds using the specified time interval": function(scale) {
-        var x = scale().domain([local(2009, 0, 1, 0, 12), local(2009, 0, 1, 23, 48)]);
-        assert.deepEqual(x.nice(_.time.day).domain(), [local(2009, 0, 1), local(2009, 0, 2)]);
-        assert.deepEqual(x.nice(_.time.week).domain(), [local(2008, 11, 28), local(2009, 0, 4)]);
-        assert.deepEqual(x.nice(_.time.month).domain(), [local(2008, 11, 1), local(2009, 1, 1)]);
-        assert.deepEqual(x.nice(_.time.year).domain(), [local(2008, 0, 1), local(2010, 0, 1)]);
-      },
-      "rounds using the specified time interval and skip": function(scale) {
-        var x = scale().domain([local(2009, 0, 1, 0, 12), local(2009, 0, 1, 23, 48)]);
-        assert.deepEqual(x.nice(_.time.day, 3).domain(), [local(2009, 0, 1), local(2009, 0, 4)]);
-        assert.deepEqual(x.nice(_.time.week, 2).domain(), [local(2008, 11, 21), local(2009, 0, 4)]);
-        assert.deepEqual(x.nice(_.time.month, 3).domain(), [local(2008, 9, 1), local(2009, 3, 1)]);
-        assert.deepEqual(x.nice(_.time.year, 10).domain(), [local(2000, 0, 1), local(2010, 0, 1)]);
-      },
-      "rounds using the specified count": function(scale) {
-        var x = scale().domain([local(2009, 0, 1, 0, 17), local(2009, 0, 1, 23, 42)]);
-        assert.deepEqual(x.nice(100).domain(), [local(2009, 0, 1, 0, 15), local(2009, 0, 1, 23, 45)]);
-        assert.deepEqual(x.nice(10).domain(), [local(2009, 0, 1), local(2009, 0, 2)]);
-      },
-      "rounds with a default count of ten if no arguments": function(scale) {
-        var x = scale().domain([local(2009, 0, 1, 0, 17), local(2009, 0, 1, 23, 42)]);
-        assert.deepEqual(x.nice().domain(), [local(2009, 0, 1), local(2009, 0, 2)]);
-      },
-      "works on degenerate domains": function(scale) {
-        var x = scale().domain([local(2009, 0, 1, 0, 12), local(2009, 0, 1, 0, 12)]);
-        assert.deepEqual(x.nice(_.time.day).domain(), [local(2009, 0, 1), local(2009, 0, 2)]);
-      },
-      "nicing a polylinear domain only affects the extent": function(linear) {
-        var x = linear().domain([local(2009, 0, 1, 0, 12), local(2009, 0, 1, 23, 48), local(2009, 0, 2, 23, 48)]).nice(_.time.day);
-        assert.deepEqual(x.domain(), [local(2009, 0, 1), local(2009, 0, 1, 23, 48), local(2009, 0, 3)]);
-      },
-      "nice succeeds on sub-second intervals": function(scale) {
-        var domain = [local(2013, 0, 1, 12, 0, 0), local(2013, 0, 1, 12, 0, 8)];
-        var x = scale().domain(domain);
-        assert.deepEqual(x.nice().domain(), domain);
-      }
-    },
-
-    "copy": {
-      "changes to the domain are isolated": function(scale) {
-        var x = scale().domain([local(2009, 0, 1), local(2010, 0, 1)]), y = x.copy();
-        x.domain([local(2010, 0, 1), local(2011, 0, 1)]);
-        assert.deepEqual(y.domain(), [local(2009, 0, 1), local(2010, 0, 1)]);
-        assert.equal(x(local(2010, 0, 1)), 0);
-        assert.equal(y(local(2010, 0, 1)), 1);
-        y.domain([local(2011, 0, 1), local(2012, 0, 1)]);
-        assert.equal(x(local(2011, 0, 1)), 1);
-        assert.equal(y(local(2011, 0, 1)), 0);
-        assert.deepEqual(x.domain(), [local(2010, 0, 1), local(2011, 0, 1)]);
-        assert.deepEqual(y.domain(), [local(2011, 0, 1), local(2012, 0, 1)]);
-      },
-      "changes to the range are isolated": function(scale) {
-        var x = scale().domain([local(2009, 0, 1), local(2010, 0, 1)]), y = x.copy();
-        x.range([1, 2]);
-        assert.deepEqual(x.invert(1), local(2009, 0, 1));
-        assert.deepEqual(y.invert(1), local(2010, 0, 1));
-        assert.deepEqual(y.range(), [0, 1]);
-        y.range([2, 3]);
-        assert.deepEqual(x.invert(2), local(2010, 0, 1));
-        assert.deepEqual(y.invert(2), local(2009, 0, 1));
-        assert.deepEqual(x.range(), [1, 2]);
-        assert.deepEqual(y.range(), [2, 3]);
-      },
-      "changes to the interpolator are isolated": function(scale) {
-        var x = scale().domain([local(2009, 0, 1), local(2010, 0, 1)]).range(["red", "blue"]),
-            i = x.interpolate(),
-            y = x.copy();
-        x.interpolate(_.interpolateHsl);
-        assert.equal(x(local(2009, 6, 1)), "#ff00fd");
-        assert.equal(y(local(2009, 6, 1)), "#81007e");
-        assert.equal(y.interpolate(), i);
-      },
-      "changes to clamping are isolated": function(scale) {
-        var x = scale().domain([local(2009, 0, 1), local(2010, 0, 1)]).clamp(true), y = x.copy();
-        x.clamp(false);
-        assert.equal(x(local(2011, 0, 1)), 2);
-        assert.equal(y(local(2011, 0, 1)), 1);
-        assert.isTrue(y.clamp());
-        y.clamp(false);
-        assert.equal(x(local(2011, 0, 1)), 2);
-        assert.equal(y(local(2011, 0, 1)), 2);
-        assert.isFalse(x.clamp());
-      }
-    },
-
-    "ticks": {
-      "observes explicit tick interval": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 12, 1, 0), local(2011, 0, 1, 12, 4, 4)]);
-        assert.deepEqual(x.ticks(_.time.minute), [
-          local(2011, 0, 1, 12, 1),
-          local(2011, 0, 1, 12, 2),
-          local(2011, 0, 1, 12, 3),
-          local(2011, 0, 1, 12, 4)
-        ]);
-      },
-      "observes explicit tick interval and step": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 12, 0, 0), local(2011, 0, 1, 12, 33, 4)]);
-        assert.deepEqual(x.ticks(_.time.minute, 10), [
-          local(2011, 0, 1, 12, 0),
-          local(2011, 0, 1, 12, 10),
-          local(2011, 0, 1, 12, 20),
-          local(2011, 0, 1, 12, 30)
-        ]);
-      },
-      "(deprecated) observes explicit tick range": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 12, 1, 0), local(2011, 0, 1, 12, 4, 4)]);
-        assert.deepEqual(x.ticks(_.time.minutes), [
-          local(2011, 0, 1, 12, 1),
-          local(2011, 0, 1, 12, 2),
-          local(2011, 0, 1, 12, 3),
-          local(2011, 0, 1, 12, 4)
-        ]);
-      },
-      "(deprecated) observes explicit tick range and step": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 12, 0, 0), local(2011, 0, 1, 12, 33, 4)]);
-        assert.deepEqual(x.ticks(_.time.minutes, 10), [
-          local(2011, 0, 1, 12, 0),
-          local(2011, 0, 1, 12, 10),
-          local(2011, 0, 1, 12, 20),
-          local(2011, 0, 1, 12, 30)
-        ]);
-      },
-      "generates sub-second ticks": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 12, 0, 0), local(2011, 0, 1, 12, 0, 1)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 0, 1, 12, 0, 0,   0),
-          local(2011, 0, 1, 12, 0, 0, 200),
-          local(2011, 0, 1, 12, 0, 0, 400),
-          local(2011, 0, 1, 12, 0, 0, 600),
-          local(2011, 0, 1, 12, 0, 0, 800),
-          local(2011, 0, 1, 12, 0, 1,   0)
-        ]);
-      },
-      "generates 1-second ticks": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 12, 0, 0), local(2011, 0, 1, 12, 0, 4)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 0, 1, 12, 0, 0),
-          local(2011, 0, 1, 12, 0, 1),
-          local(2011, 0, 1, 12, 0, 2),
-          local(2011, 0, 1, 12, 0, 3),
-          local(2011, 0, 1, 12, 0, 4)
-        ]);
-      },
-      "generates 5-second ticks": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 12, 0, 0), local(2011, 0, 1, 12, 0, 20)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 0, 1, 12, 0, 0),
-          local(2011, 0, 1, 12, 0, 5),
-          local(2011, 0, 1, 12, 0, 10),
-          local(2011, 0, 1, 12, 0, 15),
-          local(2011, 0, 1, 12, 0, 20)
-        ]);
-      },
-      "generates 15-second ticks": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 12, 0, 0), local(2011, 0, 1, 12, 0, 50)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 0, 1, 12, 0, 0),
-          local(2011, 0, 1, 12, 0, 15),
-          local(2011, 0, 1, 12, 0, 30),
-          local(2011, 0, 1, 12, 0, 45)
-        ]);
-      },
-      "generates 30-second ticks": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 12, 0, 0), local(2011, 0, 1, 12, 1, 50)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 0, 1, 12, 0, 0),
-          local(2011, 0, 1, 12, 0, 30),
-          local(2011, 0, 1, 12, 1, 0),
-          local(2011, 0, 1, 12, 1, 30)
-        ]);
-      },
-      "generates 1-minute ticks": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 12, 0, 27), local(2011, 0, 1, 12, 4, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 0, 1, 12, 1),
-          local(2011, 0, 1, 12, 2),
-          local(2011, 0, 1, 12, 3),
-          local(2011, 0, 1, 12, 4)
-        ]);
-      },
-      "generates 5-minute ticks": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 12, 3, 27), local(2011, 0, 1, 12, 21, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 0, 1, 12, 5),
-          local(2011, 0, 1, 12, 10),
-          local(2011, 0, 1, 12, 15),
-          local(2011, 0, 1, 12, 20)
-        ]);
-      },
-      "generates 15-minute ticks": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 12, 8, 27), local(2011, 0, 1, 13, 4, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 0, 1, 12, 15),
-          local(2011, 0, 1, 12, 30),
-          local(2011, 0, 1, 12, 45),
-          local(2011, 0, 1, 13, 0)
-        ]);
-      },
-      "generates 30-minute ticks": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 12, 28, 27), local(2011, 0, 1, 14, 4, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 0, 1, 12, 30),
-          local(2011, 0, 1, 13, 0),
-          local(2011, 0, 1, 13, 30),
-          local(2011, 0, 1, 14, 0)
-        ]);
-      },
-      "generates 1-hour ticks": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 12, 28, 27), local(2011, 0, 1, 16, 34, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 0, 1, 13, 0),
-          local(2011, 0, 1, 14, 0),
-          local(2011, 0, 1, 15, 0),
-          local(2011, 0, 1, 16, 0)
-        ]);
-      },
-      "generates 3-hour ticks": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 14, 28, 27), local(2011, 0, 2, 1, 34, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 0, 1, 15, 0),
-          local(2011, 0, 1, 18, 0),
-          local(2011, 0, 1, 21, 0),
-          local(2011, 0, 2, 0, 0)
-        ]);
-      },
-      "generates 6-hour ticks": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 16, 28, 27), local(2011, 0, 2, 14, 34, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 0, 1, 18, 0),
-          local(2011, 0, 2, 0, 0),
-          local(2011, 0, 2, 6, 0),
-          local(2011, 0, 2, 12, 0)
-        ]);
-      },
-      "generates 12-hour ticks": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 16, 28, 27), local(2011, 0, 3, 21, 34, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 0, 2, 0, 0),
-          local(2011, 0, 2, 12, 0),
-          local(2011, 0, 3, 0, 0),
-          local(2011, 0, 3, 12, 0)
-        ]);
-      },
-      "generates 1-day ticks": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 16, 28, 27), local(2011, 0, 5, 21, 34, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 0, 2, 0, 0),
-          local(2011, 0, 3, 0, 0),
-          local(2011, 0, 4, 0, 0),
-          local(2011, 0, 5, 0, 0)
-        ]);
-      },
-      "generates 2-day ticks": function(scale) {
-        var x = scale().domain([local(2011, 0, 2, 16, 28, 27), local(2011, 0, 9, 21, 34, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 0, 3, 0, 0),
-          local(2011, 0, 5, 0, 0),
-          local(2011, 0, 7, 0, 0),
-          local(2011, 0, 9, 0, 0)
-        ]);
-      },
-      "generates 1-week ticks": function(scale) {
-        var x = scale().domain([local(2011, 0, 1, 16, 28, 27), local(2011, 0, 23, 21, 34, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 0, 2, 0, 0),
-          local(2011, 0, 9, 0, 0),
-          local(2011, 0, 16, 0, 0),
-          local(2011, 0, 23, 0, 0)
-        ]);
-      },
-      "generates 1-month ticks": function(scale) {
-        var x = scale().domain([local(2011, 0, 18), local(2011, 4, 2)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 1, 1, 0, 0),
-          local(2011, 2, 1, 0, 0),
-          local(2011, 3, 1, 0, 0),
-          local(2011, 4, 1, 0, 0)
-        ]);
-      },
-      "generates 3-month ticks": function(scale) {
-        var x = scale().domain([local(2010, 11, 18), local(2011, 10, 2)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 0, 1, 0, 0),
-          local(2011, 3, 1, 0, 0),
-          local(2011, 6, 1, 0, 0),
-          local(2011, 9, 1, 0, 0)
-        ]);
-      },
-      "generates 1-year ticks": function(scale) {
-        var x = scale().domain([local(2010, 11, 18), local(2014, 2, 2)]);
-        assert.deepEqual(x.ticks(4), [
-          local(2011, 0, 1, 0, 0),
-          local(2012, 0, 1, 0, 0),
-          local(2013, 0, 1, 0, 0),
-          local(2014, 0, 1, 0, 0)
-        ]);
-      },
-      "generates multi-year ticks": function(scale) {
-        var x = scale().domain([local(0, 11, 18), local(2014, 2, 2)]);
-        assert.deepEqual(x.ticks(6), [
-          local( 500, 0, 1, 0, 0),
-          local(1000, 0, 1, 0, 0),
-          local(1500, 0, 1, 0, 0),
-          local(2000, 0, 1, 0, 0)
-        ]);
-      },
-      "returns one tick for degenerate empty domain": function(scale) {
-        var x = scale().domain([local(2014, 2, 2), local(2014, 2, 2)]);
-        assert.deepEqual(x.ticks(6), [local(2014, 2, 2)]);
-      }
-    },
-
-    "tickFormat": {
-      topic: function(scale) {
-        return scale().tickFormat();
-      },
-      "formats year on New Year's": function(format) {
-        assert.equal(format(local(2011, 0, 1)), "2011");
-        assert.equal(format(local(2012, 0, 1)), "2012");
-        assert.equal(format(local(2013, 0, 1)), "2013");
-      },
-      "formats month on the 1st of each month": function(format) {
-        assert.equal(format(local(2011, 1, 1)), "February");
-        assert.equal(format(local(2011, 2, 1)), "March");
-        assert.equal(format(local(2011, 3, 1)), "April");
-      },
-      "formats week on Sunday midnight": function(format) {
-        assert.equal(format(local(2011, 1, 6)), "Feb 06");
-        assert.equal(format(local(2011, 1, 13)), "Feb 13");
-        assert.equal(format(local(2011, 1, 20)), "Feb 20");
-      },
-      "formats date on midnight": function(format) {
-        assert.equal(format(local(2011, 1, 2)), "Wed 02");
-        assert.equal(format(local(2011, 1, 3)), "Thu 03");
-        assert.equal(format(local(2011, 1, 4)), "Fri 04");
-      },
-      "formats hour on minute zero": function(format) {
-        assert.equal(format(local(2011, 1, 2, 11)), "11 AM");
-        assert.equal(format(local(2011, 1, 2, 12)), "12 PM");
-        assert.equal(format(local(2011, 1, 2, 13)), "01 PM");
-      },
-      "formats minute on second zero": function(format) {
-        assert.equal(format(local(2011, 1, 2, 11, 59)), "11:59");
-        assert.equal(format(local(2011, 1, 2, 12,  1)), "12:01");
-        assert.equal(format(local(2011, 1, 2, 12,  2)), "12:02");
-      },
-      "otherwise, formats second": function(format) {
-        assert.equal(format(local(2011, 1, 2, 12,  1,  9)), ":09");
-        assert.equal(format(local(2011, 1, 2, 12,  1, 10)), ":10");
-        assert.equal(format(local(2011, 1, 2, 12,  1, 11)), ":11");
-      }
-    }
-  }
-});
-
-suite.addBatch({
-  "scale.utc": {
-    topic: load("time/scale-utc").expression("d3.time.scale.utc").document(),
-
-    "nice": {
-      "rounds using the specified time interval": function(scale) {
-        var x = scale().domain([utc(2009, 0, 1, 0, 12), utc(2009, 0, 1, 23, 48)]);
-        assert.deepEqual(x.nice(_.time.day.utc).domain(), [utc(2009, 0, 1), utc(2009, 0, 2)]);
-        assert.deepEqual(x.nice(_.time.week.utc).domain(), [utc(2008, 11, 28), utc(2009, 0, 4)]);
-        assert.deepEqual(x.nice(_.time.month.utc).domain(), [utc(2008, 11, 1), utc(2009, 1, 1)]);
-        assert.deepEqual(x.nice(_.time.year.utc).domain(), [utc(2008, 0, 1), utc(2010, 0, 1)]);
-      },
-      "rounds using the specified time interval and skip": function(scale) {
-        var x = scale().domain([utc(2009, 0, 1, 0, 12), utc(2009, 0, 1, 23, 48)]);
-        assert.deepEqual(x.nice(_.time.day.utc, 3).domain(), [utc(2009, 0, 1), utc(2009, 0, 4)]);
-        assert.deepEqual(x.nice(_.time.week.utc, 2).domain(), [utc(2008, 11, 21), utc(2009, 0, 4)]);
-        assert.deepEqual(x.nice(_.time.month.utc, 3).domain(), [utc(2008, 9, 1), utc(2009, 3, 1)]);
-        assert.deepEqual(x.nice(_.time.year.utc, 10).domain(), [utc(2000, 0, 1), utc(2010, 0, 1)]);
-      },
-      "rounds using the specified count": function(scale) {
-        var x = scale().domain([utc(2009, 0, 1, 0, 17), utc(2009, 0, 1, 23, 42)]);
-        assert.deepEqual(x.nice(100).domain(), [utc(2009, 0, 1, 0, 15), utc(2009, 0, 1, 23, 45)]);
-        assert.deepEqual(x.nice(10).domain(), [utc(2009, 0, 1), utc(2009, 0, 2)]);
-      },
-      "rounds with a default count of ten if no arguments": function(scale) {
-        var x = scale().domain([utc(2009, 0, 1, 0, 17), utc(2009, 0, 1, 23, 42)]);
-        assert.deepEqual(x.nice().domain(), [utc(2009, 0, 1), utc(2009, 0, 2)]);
-      },
-      "works on degenerate domains": function(scale) {
-        var x = scale().domain([utc(2009, 0, 1, 0, 12), utc(2009, 0, 1, 0, 12)]);
-        assert.deepEqual(x.nice(_.time.day.utc).domain(), [utc(2009, 0, 1), utc(2009, 0, 2)]);
-      },
-      "nicing a polylinear domain only affects the extent": function(linear) {
-        var x = linear().domain([utc(2009, 0, 1, 0, 12), utc(2009, 0, 1, 23, 48), utc(2009, 0, 2, 23, 48)]).nice(_.time.day.utc);
-        assert.deepEqual(x.domain(), [utc(2009, 0, 1), utc(2009, 0, 1, 23, 48), utc(2009, 0, 3)]);
-      }
-    },
-
-    "ticks": {
-      "observes explicit tick interval": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 12, 1, 0), utc(2011, 0, 1, 12, 4, 4)]);
-        assert.deepEqual(x.ticks(_.time.minute.utc), [
-          utc(2011, 0, 1, 12, 1),
-          utc(2011, 0, 1, 12, 2),
-          utc(2011, 0, 1, 12, 3),
-          utc(2011, 0, 1, 12, 4)
-        ]);
-      },
-      "observes explicit tick interval and step": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 12, 0, 0), utc(2011, 0, 1, 12, 33, 4)]);
-        assert.deepEqual(x.ticks(_.time.minute.utc, 10), [
-          utc(2011, 0, 1, 12, 0),
-          utc(2011, 0, 1, 12, 10),
-          utc(2011, 0, 1, 12, 20),
-          utc(2011, 0, 1, 12, 30)
-        ]);
-      },
-      "(deprecated) observes explicit tick range": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 12, 1, 0), utc(2011, 0, 1, 12, 4, 4)]);
-        assert.deepEqual(x.ticks(_.time.minutes.utc), [
-          utc(2011, 0, 1, 12, 1),
-          utc(2011, 0, 1, 12, 2),
-          utc(2011, 0, 1, 12, 3),
-          utc(2011, 0, 1, 12, 4)
-        ]);
-      },
-      "(deprecated) observes explicit tick range and step": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 12, 0, 0), utc(2011, 0, 1, 12, 33, 4)]);
-        assert.deepEqual(x.ticks(_.time.minutes.utc, 10), [
-          utc(2011, 0, 1, 12, 0),
-          utc(2011, 0, 1, 12, 10),
-          utc(2011, 0, 1, 12, 20),
-          utc(2011, 0, 1, 12, 30)
-        ]);
-      },
-      "generates sub-second ticks": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 12, 0, 0), utc(2011, 0, 1, 12, 0, 1)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 0, 1, 12, 0, 0,   0),
-          utc(2011, 0, 1, 12, 0, 0, 200),
-          utc(2011, 0, 1, 12, 0, 0, 400),
-          utc(2011, 0, 1, 12, 0, 0, 600),
-          utc(2011, 0, 1, 12, 0, 0, 800),
-          utc(2011, 0, 1, 12, 0, 1,   0)
-        ]);
-      },
-      "generates 1-second ticks": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 12, 0, 0), utc(2011, 0, 1, 12, 0, 4)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 0, 1, 12, 0, 0),
-          utc(2011, 0, 1, 12, 0, 1),
-          utc(2011, 0, 1, 12, 0, 2),
-          utc(2011, 0, 1, 12, 0, 3),
-          utc(2011, 0, 1, 12, 0, 4)
-        ]);
-      },
-      "generates 5-second ticks": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 12, 0, 0), utc(2011, 0, 1, 12, 0, 20)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 0, 1, 12, 0, 0),
-          utc(2011, 0, 1, 12, 0, 5),
-          utc(2011, 0, 1, 12, 0, 10),
-          utc(2011, 0, 1, 12, 0, 15),
-          utc(2011, 0, 1, 12, 0, 20)
-        ]);
-      },
-      "generates 15-second ticks": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 12, 0, 0), utc(2011, 0, 1, 12, 0, 50)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 0, 1, 12, 0, 0),
-          utc(2011, 0, 1, 12, 0, 15),
-          utc(2011, 0, 1, 12, 0, 30),
-          utc(2011, 0, 1, 12, 0, 45)
-        ]);
-      },
-      "generates 30-second ticks": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 12, 0, 0), utc(2011, 0, 1, 12, 1, 50)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 0, 1, 12, 0, 0),
-          utc(2011, 0, 1, 12, 0, 30),
-          utc(2011, 0, 1, 12, 1, 0),
-          utc(2011, 0, 1, 12, 1, 30)
-        ]);
-      },
-      "generates 1-minute ticks": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 12, 0, 27), utc(2011, 0, 1, 12, 4, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 0, 1, 12, 1),
-          utc(2011, 0, 1, 12, 2),
-          utc(2011, 0, 1, 12, 3),
-          utc(2011, 0, 1, 12, 4)
-        ]);
-      },
-      "generates 5-minute ticks": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 12, 3, 27), utc(2011, 0, 1, 12, 21, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 0, 1, 12, 5),
-          utc(2011, 0, 1, 12, 10),
-          utc(2011, 0, 1, 12, 15),
-          utc(2011, 0, 1, 12, 20)
-        ]);
-      },
-      "generates 15-minute ticks": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 12, 8, 27), utc(2011, 0, 1, 13, 4, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 0, 1, 12, 15),
-          utc(2011, 0, 1, 12, 30),
-          utc(2011, 0, 1, 12, 45),
-          utc(2011, 0, 1, 13, 0)
-        ]);
-      },
-      "generates 30-minute ticks": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 12, 28, 27), utc(2011, 0, 1, 14, 4, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 0, 1, 12, 30),
-          utc(2011, 0, 1, 13, 0),
-          utc(2011, 0, 1, 13, 30),
-          utc(2011, 0, 1, 14, 0)
-        ]);
-      },
-      "generates 1-hour ticks": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 12, 28, 27), utc(2011, 0, 1, 16, 34, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 0, 1, 13, 0),
-          utc(2011, 0, 1, 14, 0),
-          utc(2011, 0, 1, 15, 0),
-          utc(2011, 0, 1, 16, 0)
-        ]);
-      },
-      "generates 3-hour ticks": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 14, 28, 27), utc(2011, 0, 2, 1, 34, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 0, 1, 15, 0),
-          utc(2011, 0, 1, 18, 0),
-          utc(2011, 0, 1, 21, 0),
-          utc(2011, 0, 2, 0, 0)
-        ]);
-      },
-      "generates 6-hour ticks": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 16, 28, 27), utc(2011, 0, 2, 14, 34, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 0, 1, 18, 0),
-          utc(2011, 0, 2, 0, 0),
-          utc(2011, 0, 2, 6, 0),
-          utc(2011, 0, 2, 12, 0)
-        ]);
-      },
-      "generates 12-hour ticks": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 16, 28, 27), utc(2011, 0, 3, 21, 34, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 0, 2, 0, 0),
-          utc(2011, 0, 2, 12, 0),
-          utc(2011, 0, 3, 0, 0),
-          utc(2011, 0, 3, 12, 0)
-        ]);
-      },
-      "generates 1-day ticks": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 16, 28, 27), utc(2011, 0, 5, 21, 34, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 0, 2, 0, 0),
-          utc(2011, 0, 3, 0, 0),
-          utc(2011, 0, 4, 0, 0),
-          utc(2011, 0, 5, 0, 0)
-        ]);
-      },
-      "generates 2-day ticks": function(scale) {
-        var x = scale().domain([utc(2011, 0, 2, 16, 28, 27), utc(2011, 0, 9, 21, 34, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 0, 3, 0, 0),
-          utc(2011, 0, 5, 0, 0),
-          utc(2011, 0, 7, 0, 0),
-          utc(2011, 0, 9, 0, 0)
-        ]);
-      },
-      "generates 1-week ticks": function(scale) {
-        var x = scale().domain([utc(2011, 0, 1, 16, 28, 27), utc(2011, 0, 23, 21, 34, 12)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 0, 2, 0, 0),
-          utc(2011, 0, 9, 0, 0),
-          utc(2011, 0, 16, 0, 0),
-          utc(2011, 0, 23, 0, 0)
-        ]);
-      },
-      "generates 1-month ticks": function(scale) {
-        var x = scale().domain([utc(2011, 0, 18), utc(2011, 4, 2)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 1, 1, 0, 0),
-          utc(2011, 2, 1, 0, 0),
-          utc(2011, 3, 1, 0, 0),
-          utc(2011, 4, 1, 0, 0)
-        ]);
-      },
-      "generates 3-month ticks": function(scale) {
-        var x = scale().domain([utc(2010, 11, 18), utc(2011, 10, 2)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 0, 1, 0, 0),
-          utc(2011, 3, 1, 0, 0),
-          utc(2011, 6, 1, 0, 0),
-          utc(2011, 9, 1, 0, 0)
-        ]);
-      },
-      "generates 1-year ticks": function(scale) {
-        var x = scale().domain([utc(2010, 11, 18), utc(2014, 2, 2)]);
-        assert.deepEqual(x.ticks(4), [
-          utc(2011, 0, 1, 0, 0),
-          utc(2012, 0, 1, 0, 0),
-          utc(2013, 0, 1, 0, 0),
-          utc(2014, 0, 1, 0, 0)
-        ]);
-      },
-      "generates multi-year ticks": function(scale) {
-        var x = scale().domain([utc(0, 11, 18), utc(2014, 2, 2)]);
-        assert.deepEqual(x.ticks(6), [
-          utc( 500, 0, 1, 0, 0),
-          utc(1000, 0, 1, 0, 0),
-          utc(1500, 0, 1, 0, 0),
-          utc(2000, 0, 1, 0, 0)
-        ]);
-      },
-      "returns one tick for degenerate empty domain": function(scale) {
-        var x = scale().domain([utc(2014, 2, 2), utc(2014, 2, 2)]);
-        assert.deepEqual(x.ticks(6), [utc(2014, 2, 2)]);
-      }
-    },
-
-    "tickFormat": {
-      topic: function(scale) {
-        return scale().tickFormat();
-      },
-      "formats year on New Year's": function(format) {
-        assert.equal(format(utc(2011, 0, 1)), "2011");
-        assert.equal(format(utc(2012, 0, 1)), "2012");
-        assert.equal(format(utc(2013, 0, 1)), "2013");
-      },
-      "formats month on the 1st of each month": function(format) {
-        assert.equal(format(utc(2011, 1, 1)), "February");
-        assert.equal(format(utc(2011, 2, 1)), "March");
-        assert.equal(format(utc(2011, 3, 1)), "April");
-      },
-      "formats week on Sunday midnight": function(format) {
-        assert.equal(format(utc(2011, 1, 6)), "Feb 06");
-        assert.equal(format(utc(2011, 1, 13)), "Feb 13");
-        assert.equal(format(utc(2011, 1, 20)), "Feb 20");
-      },
-      "formats date on midnight": function(format) {
-        assert.equal(format(utc(2011, 1, 2)), "Wed 02");
-        assert.equal(format(utc(2011, 1, 3)), "Thu 03");
-        assert.equal(format(utc(2011, 1, 4)), "Fri 04");
-      },
-      "formats hour on minute zero": function(format) {
-        assert.equal(format(utc(2011, 1, 2, 11)), "11 AM");
-        assert.equal(format(utc(2011, 1, 2, 12)), "12 PM");
-        assert.equal(format(utc(2011, 1, 2, 13)), "01 PM");
-      },
-      "formats minute on second zero": function(format) {
-        assert.equal(format(utc(2011, 1, 2, 11, 59)), "11:59");
-        assert.equal(format(utc(2011, 1, 2, 12,  1)), "12:01");
-        assert.equal(format(utc(2011, 1, 2, 12,  2)), "12:02");
-      },
-      "formats second on millisecond zero": function(format) {
-        assert.equal(format(utc(2011, 1, 2, 12,  1,  9)), ":09");
-        assert.equal(format(utc(2011, 1, 2, 12,  1, 10)), ":10");
-        assert.equal(format(utc(2011, 1, 2, 12,  1, 11)), ":11");
-      },
-      "otherwise, formats milliseconds": function(format) {
-        assert.equal(format(utc(2011, 1, 2, 12,  1,  0,   9)), ".009");
-        assert.equal(format(utc(2011, 1, 2, 12,  1,  0,  10)), ".010");
-        assert.equal(format(utc(2011, 1, 2, 12,  1,  0,  11)), ".011");
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/time/second-test.js b/test/time/second-test.js
deleted file mode 100644
index e740d3a29eaf6..0000000000000
--- a/test/time/second-test.js
+++ /dev/null
@@ -1,143 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("./time"),
-    local = time.local,
-    utc = time.utc;
-
-var suite = vows.describe("d3.time.second");
-
-suite.addBatch({
-  "second": {
-    topic: load("time/second").expression("d3.time.second"),
-    "defaults to floor": function(interval) {
-      assert.strictEqual(interval, interval.floor);
-    },
-    "floor": {
-      topic: function(interval) {
-        return interval.floor;
-      },
-      "returns seconds": function(floor) {
-        assert.deepEqual(floor(local(2010, 11, 31, 23, 59, 59, 999)), local(2010, 11, 31, 23, 59, 59));
-        assert.deepEqual(floor(local(2011, 00, 01, 00, 00, 00, 000)), local(2011, 00, 01, 00, 00, 00));
-        assert.deepEqual(floor(local(2011, 00, 01, 00, 00, 00, 001)), local(2011, 00, 01, 00, 00, 00));
-      }
-    },
-    "round": {
-      topic: function(interval) {
-        return interval.round;
-      },
-      "returns seconds": function(round) {
-        assert.deepEqual(round(local(2010, 11, 31, 23, 59, 59, 999)), local(2011, 00, 01, 00, 00, 00));
-        assert.deepEqual(round(local(2011, 00, 01, 00, 00, 00, 499)), local(2011, 00, 01, 00, 00, 00));
-        assert.deepEqual(round(local(2011, 00, 01, 00, 00, 00, 500)), local(2011, 00, 01, 00, 00, 01));
-      }
-    },
-    "ceil": {
-      topic: function(interval) {
-        return interval.ceil;
-      },
-      "returns seconds": function(ceil) {
-        assert.deepEqual(ceil(local(2010, 11, 31, 23, 59, 59, 999)), local(2011, 00, 01, 00, 00, 00));
-        assert.deepEqual(ceil(local(2011, 00, 01, 00, 00, 00, 000)), local(2011, 00, 01, 00, 00, 00));
-        assert.deepEqual(ceil(local(2011, 00, 01, 00, 00, 00, 001)), local(2011, 00, 01, 00, 00, 01));
-      }
-    },
-    "offset": {
-      topic: function(interval) {
-        return interval.offset;
-      },
-      "does not modify the passed-in date": function(offset) {
-        var date = local(2010, 11, 31, 23, 59, 59, 999);
-        offset(date, +1);
-        assert.deepEqual(date, local(2010, 11, 31, 23, 59, 59, 999));
-      },
-      "does not round the passed-in-date": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 999), +1), local(2011, 00, 01, 00, 00, 00, 999));
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 456), -2), local(2010, 11, 31, 23, 59, 57, 456));
-      },
-      "allows negative offsets": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59), -1), local(2010, 11, 31, 23, 59, 58));
-        assert.deepEqual(offset(local(2011, 00, 01, 00, 00, 00), -2), local(2010, 11, 31, 23, 59, 58));
-        assert.deepEqual(offset(local(2011, 00, 01, 00, 00, 00), -1), local(2010, 11, 31, 23, 59, 59));
-      },
-      "allows positive offsets": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 58), +1), local(2010, 11, 31, 23, 59, 59));
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 58), +2), local(2011, 00, 01, 00, 00, 00));
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59), +1), local(2011, 00, 01, 00, 00, 00));
-      },
-      "allows zero offset": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 999), 0), local(2010, 11, 31, 23, 59, 59, 999));
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 58, 000), 0), local(2010, 11, 31, 23, 59, 58, 000));
-      }
-    },
-    "UTC": {
-      topic: function(interval) {
-        return interval.utc;
-      },
-      "defaults to floor": function(interval) {
-        assert.strictEqual(interval, interval.floor);
-      },
-      "floor": {
-        topic: function(interval) {
-          return interval.floor;
-        },
-        "returns seconds": function(floor) {
-          assert.deepEqual(floor(utc(2010, 11, 31, 23, 59, 59, 999)), utc(2010, 11, 31, 23, 59, 59));
-          assert.deepEqual(floor(utc(2011, 00, 01, 00, 00, 00, 000)), utc(2011, 00, 01, 00, 00, 00));
-          assert.deepEqual(floor(utc(2011, 00, 01, 00, 00, 00, 001)), utc(2011, 00, 01, 00, 00, 00));
-        }
-      },
-      "round": {
-        topic: function(interval) {
-          return interval.round;
-        },
-        "returns seconds": function(round) {
-          assert.deepEqual(round(utc(2010, 11, 31, 23, 59, 59, 999)), utc(2011, 00, 01, 00, 00, 00));
-          assert.deepEqual(round(utc(2011, 00, 01, 00, 00, 00, 499)), utc(2011, 00, 01, 00, 00, 00));
-          assert.deepEqual(round(utc(2011, 00, 01, 00, 00, 00, 500)), utc(2011, 00, 01, 00, 00, 01));
-        }
-      },
-      "ceil": {
-        topic: function(interval) {
-          return interval.ceil;
-        },
-        "returns seconds": function(ceil) {
-          assert.deepEqual(ceil(utc(2010, 11, 31, 23, 59, 59, 999)), utc(2011, 00, 01, 00, 00, 00));
-          assert.deepEqual(ceil(utc(2011, 00, 01, 00, 00, 00, 000)), utc(2011, 00, 01, 00, 00, 00));
-          assert.deepEqual(ceil(utc(2011, 00, 01, 00, 00, 00, 001)), utc(2011, 00, 01, 00, 00, 01));
-        }
-      },
-      "offset": {
-        topic: function(interval) {
-          return interval.offset;
-        },
-        "does not modify the passed-in date": function(offset) {
-          var date = utc(2010, 11, 31, 23, 59, 59, 999);
-          offset(date, +1);
-          assert.deepEqual(date, utc(2010, 11, 31, 23, 59, 59, 999));
-        },
-        "does not round the passed-in-date": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 999), +1), utc(2011, 00, 01, 00, 00, 00, 999));
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 456), -2), utc(2010, 11, 31, 23, 59, 57, 456));
-        },
-        "allows negative offsets": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59), -1), utc(2010, 11, 31, 23, 59, 58));
-          assert.deepEqual(offset(utc(2011, 00, 01, 00, 00, 00), -2), utc(2010, 11, 31, 23, 59, 58));
-          assert.deepEqual(offset(utc(2011, 00, 01, 00, 00, 00), -1), utc(2010, 11, 31, 23, 59, 59));
-        },
-        "allows positive offsets": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 58), +1), utc(2010, 11, 31, 23, 59, 59));
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 58), +2), utc(2011, 00, 01, 00, 00, 00));
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59), +1), utc(2011, 00, 01, 00, 00, 00));
-        },
-        "allows zero offset": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 999), 0), utc(2010, 11, 31, 23, 59, 59, 999));
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 58, 000), 0), utc(2010, 11, 31, 23, 59, 58, 000));
-        }
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/time/seconds-test.js b/test/time/seconds-test.js
deleted file mode 100644
index e8c6ab44867de..0000000000000
--- a/test/time/seconds-test.js
+++ /dev/null
@@ -1,91 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("./time"),
-    local = time.local,
-    utc = time.utc;
-
-var suite = vows.describe("d3.time.seconds");
-
-suite.addBatch({
-  "seconds": {
-    topic: load("time/second").expression("d3.time.seconds"),
-    "returns seconds": function(range) {
-      assert.deepEqual(range(local(2010, 11, 31, 23, 59, 59), local(2011, 0, 1, 0, 0, 2)), [
-        local(2010, 11, 31, 23, 59, 59),
-        local(2011, 0, 1, 0, 0, 0),
-        local(2011, 0, 1, 0, 0, 1)
-      ]);
-    },
-    "has an inclusive lower bound": function(range) {
-      assert.deepEqual(range(local(2010, 11, 31, 23, 59, 59), local(2011, 0, 1, 0, 0, 2))[0], local(2010, 11, 31, 23, 59, 59));
-    },
-    "has an exclusive upper bound": function(range) {
-      assert.deepEqual(range(local(2010, 11, 31, 23, 59, 59), local(2011, 0, 1, 0, 0, 2))[2], local(2011, 0, 1, 0, 0, 1));
-    },
-    "can skip seconds": function(range) {
-      assert.deepEqual(range(local(2011, 1, 1, 12, 0, 7), local(2011, 1, 1, 12, 1, 7), 15), [
-        local(2011, 1, 1, 12, 0, 15),
-        local(2011, 1, 1, 12, 0, 30),
-        local(2011, 1, 1, 12, 0, 45),
-        local(2011, 1, 1, 12, 1, 0)
-      ]);
-    },
-    "observes start of daylight savings time": function(range) {
-      assert.deepEqual(range(utc(2011, 2, 13, 9, 59, 59), utc(2011, 2, 13, 10, 0, 2)), [
-        utc(2011, 2, 13, 9, 59, 59),
-        utc(2011, 2, 13, 10, 0, 0),
-        utc(2011, 2, 13, 10, 0, 1)
-      ]);
-    },
-    "observes end of daylight savings time": function(range) {
-      assert.deepEqual(range(utc(2011, 10, 6, 8, 59, 59), utc(2011, 10, 6, 9, 0, 2)), [
-        utc(2011, 10, 6, 8, 59, 59),
-        utc(2011, 10, 6, 9, 0, 0),
-        utc(2011, 10, 6, 9, 0, 1)
-      ]);
-    },
-    "UTC": {
-      topic: function(range) {
-        return range.utc;
-      },
-      "returns seconds": function(range) {
-        assert.deepEqual(range(utc(2010, 11, 31, 23, 59, 59), utc(2011, 0, 1, 0, 0, 2)), [
-          utc(2010, 11, 31, 23, 59, 59),
-          utc(2011, 0, 1, 0, 0, 0),
-          utc(2011, 0, 1, 0, 0, 1)
-        ]);
-      },
-      "has an inclusive lower bound": function(range) {
-        assert.deepEqual(range(utc(2010, 11, 31, 23, 59, 59), utc(2011, 0, 1, 0, 0, 2))[0], utc(2010, 11, 31, 23, 59, 59));
-      },
-      "has an exclusive upper bound": function(range) {
-        assert.deepEqual(range(utc(2010, 11, 31, 23, 59, 59), utc(2011, 0, 1, 0, 0, 2))[2], utc(2011, 0, 1, 0, 0, 1));
-      },
-      "can skip seconds": function(range) {
-        assert.deepEqual(range(utc(2011, 1, 1, 12, 0, 7), utc(2011, 1, 1, 12, 1, 7), 15), [
-          utc(2011, 1, 1, 12, 0, 15),
-          utc(2011, 1, 1, 12, 0, 30),
-          utc(2011, 1, 1, 12, 0, 45),
-          utc(2011, 1, 1, 12, 1, 0)
-        ]);
-      },
-      "does not observe the start of daylight savings time": function(range) {
-        assert.deepEqual(range(utc(2011, 2, 13, 9, 59, 59), utc(2011, 2, 13, 10, 0, 2)), [
-          utc(2011, 2, 13, 9, 59, 59),
-          utc(2011, 2, 13, 10, 0, 0),
-          utc(2011, 2, 13, 10, 0, 1)
-        ]);
-      },
-      "does not observe the end of daylight savings time": function(range) {
-        assert.deepEqual(range(utc(2011, 10, 6, 8, 59, 59), utc(2011, 10, 6, 9, 0, 2)), [
-          utc(2011, 10, 6, 8, 59, 59),
-          utc(2011, 10, 6, 9, 0, 0),
-          utc(2011, 10, 6, 9, 0, 1)
-        ]);
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/time/time.js b/test/time/time.js
deleted file mode 100644
index 32bca646b9199..0000000000000
--- a/test/time/time.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var offset = 0;
-
-exports.local = function(year, month, day, hours, minutes, seconds, milliseconds) {
-  var date = new Date;
-  date.setFullYear(year, month, day);
-  date.setHours(hours || 0, offset + (minutes || 0), seconds || 0, milliseconds || 0);
-  return date;
-};
-
-exports.utc = function(year, month, day, hours, minutes, seconds, milliseconds) {
-  var date = new Date;
-  date.setUTCFullYear(year, month, day);
-  date.setUTCHours(hours || 0, minutes || 0, seconds || 0, milliseconds || 0);
-  return date;
-};
-
-exports.zone = function(tzOffset, scope) {
-  return function() {
-    var o = Date.prototype.getTimezoneOffset;
-    try {
-      // Note: assumes the dates are not in DST.
-      offset = -tzOffset - new Date(0).getTimezoneOffset();
-      Date.prototype.getTimezoneOffset = function() { return offset; };
-      scope.apply(this, arguments);
-    } finally {
-      offset = 0;
-      Date.prototype.getTimezoneOffset = o;
-    }
-  };
-};
diff --git a/test/time/week-test.js b/test/time/week-test.js
deleted file mode 100644
index f0db1f7f18d50..0000000000000
--- a/test/time/week-test.js
+++ /dev/null
@@ -1,162 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("./time"),
-    local = time.local,
-    utc = time.utc;
-
-var suite = vows.describe("d3.time.week");
-
-suite.addBatch({
-  "week": {
-    topic: load("time/week").expression("d3.time.week"),
-    "defaults to floor": function(interval) {
-      assert.strictEqual(interval, interval.floor);
-    },
-    "floor": {
-      topic: function(interval) {
-        return interval.floor;
-      },
-      "returns sundays": function(floor) {
-        assert.deepEqual(floor(local(2010, 11, 31, 23, 59, 59)), local(2010, 11, 26));
-        assert.deepEqual(floor(local(2011, 00, 01, 00, 00, 00)), local(2010, 11, 26));
-        assert.deepEqual(floor(local(2011, 00, 01, 00, 00, 01)), local(2010, 11, 26));
-        assert.deepEqual(floor(local(2011, 00, 01, 23, 59, 59)), local(2010, 11, 26));
-        assert.deepEqual(floor(local(2011, 00, 02, 00, 00, 00)), local(2011, 00, 02));
-        assert.deepEqual(floor(local(2011, 00, 02, 00, 00, 01)), local(2011, 00, 02));
-      },
-      "observes the start of daylight savings time": function(floor) {
-        assert.deepEqual(floor(local(2011, 02, 13, 01)), local(2011, 02, 13));
-      },
-      "observes the end of the daylight savings time": function(floor) {
-        assert.deepEqual(floor(local(2011, 10, 06, 01)), local(2011, 10, 06));
-      },
-      "correctly handles years in the first century": function(floor) {
-        assert.deepEqual(floor(local(0011, 10, 06, 07)), local(0011, 10, 01));
-      }
-    },
-    "ceil": {
-      topic: function(interval) {
-        return interval.ceil;
-      },
-      "returns sundays": function(ceil) {
-        assert.deepEqual(ceil(local(2010, 11, 31, 23, 59, 59)), local(2011, 00, 02));
-        assert.deepEqual(ceil(local(2011, 00, 01, 00, 00, 00)), local(2011, 00, 02));
-        assert.deepEqual(ceil(local(2011, 00, 01, 00, 00, 01)), local(2011, 00, 02));
-        assert.deepEqual(ceil(local(2011, 00, 01, 23, 59, 59)), local(2011, 00, 02));
-        assert.deepEqual(ceil(local(2011, 00, 02, 00, 00, 00)), local(2011, 00, 02));
-        assert.deepEqual(ceil(local(2011, 00, 02, 00, 00, 01)), local(2011, 00, 09));
-      },
-      "observes the start of daylight savings time": function(ceil) {
-        assert.deepEqual(ceil(local(2011, 02, 13, 01)), local(2011, 02, 20));
-      },
-      "observes the end of the daylight savings time": function(ceil) {
-        assert.deepEqual(ceil(local(2011, 10, 06, 01)), local(2011, 10, 13));
-      }
-    },
-    "offset": {
-      topic: function(interval) {
-        return interval.offset;
-      },
-      "does not modify the passed-in date": function(offset) {
-        var date = local(2010, 11, 31, 23, 59, 59, 999);
-        offset(date, +1);
-        assert.deepEqual(date, local(2010, 11, 31, 23, 59, 59, 999));
-      },
-      "does not round the passed-in-date": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 999), +1), local(2011, 00, 07, 23, 59, 59, 999));
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 456), -2), local(2010, 11, 17, 23, 59, 59, 456));
-      },
-      "allows negative offsets": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 01), -1), local(2010, 10, 24));
-        assert.deepEqual(offset(local(2011, 00, 01), -2), local(2010, 11, 18));
-        assert.deepEqual(offset(local(2011, 00, 01), -1), local(2010, 11, 25));
-      },
-      "allows positive offsets": function(offset) {
-        assert.deepEqual(offset(local(2010, 10, 24), +1), local(2010, 11, 01));
-        assert.deepEqual(offset(local(2010, 11, 18), +2), local(2011, 00, 01));
-        assert.deepEqual(offset(local(2010, 11, 25), +1), local(2011, 00, 01));
-      },
-      "allows zero offset": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 999), 0), local(2010, 11, 31, 23, 59, 59, 999));
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 58, 000), 0), local(2010, 11, 31, 23, 59, 58, 000));
-      }
-    },
-    "UTC": {
-      topic: function(interval) {
-        return interval.utc;
-      },
-      "defaults to floor": function(interval) {
-        assert.strictEqual(interval, interval.floor);
-      },
-      "floor": {
-        topic: function(interval) {
-          return interval.floor;
-        },
-        "returns sundays": function(floor) {
-          assert.deepEqual(floor(utc(2010, 11, 31, 23, 59, 59)), utc(2010, 11, 26));
-          assert.deepEqual(floor(utc(2011, 00, 01, 00, 00, 00)), utc(2010, 11, 26));
-          assert.deepEqual(floor(utc(2011, 00, 01, 00, 00, 01)), utc(2010, 11, 26));
-          assert.deepEqual(floor(utc(2011, 00, 01, 23, 59, 59)), utc(2010, 11, 26));
-          assert.deepEqual(floor(utc(2011, 00, 02, 00, 00, 00)), utc(2011, 00, 02));
-          assert.deepEqual(floor(utc(2011, 00, 02, 00, 00, 01)), utc(2011, 00, 02));
-        },
-        "does not observe the start of daylight savings time": function(floor) {
-          assert.deepEqual(floor(utc(2011, 02, 13, 01)), utc(2011, 02, 13));
-        },
-        "does not observe the end of the daylight savings time": function(floor) {
-          assert.deepEqual(floor(utc(2011, 10, 06, 01)), utc(2011, 10, 06));
-        }
-      },
-      "ceil": {
-        topic: function(interval) {
-          return interval.ceil;
-        },
-        "returns sundays": function(ceil) {
-          assert.deepEqual(ceil(utc(2010, 11, 31, 23, 59, 59)), utc(2011, 00, 02));
-          assert.deepEqual(ceil(utc(2011, 00, 01, 00, 00, 00)), utc(2011, 00, 02));
-          assert.deepEqual(ceil(utc(2011, 00, 01, 00, 00, 01)), utc(2011, 00, 02));
-          assert.deepEqual(ceil(utc(2011, 00, 01, 23, 59, 59)), utc(2011, 00, 02));
-          assert.deepEqual(ceil(utc(2011, 00, 02, 00, 00, 00)), utc(2011, 00, 02));
-          assert.deepEqual(ceil(utc(2011, 00, 02, 00, 00, 01)), utc(2011, 00, 09));
-        },
-        "does not observe the start of daylight savings time": function(ceil) {
-          assert.deepEqual(ceil(utc(2011, 02, 13, 01)), utc(2011, 02, 20));
-        },
-        "does not observe the end of the daylight savings time": function(ceil) {
-          assert.deepEqual(ceil(utc(2011, 10, 06, 01)), utc(2011, 10, 13));
-        }
-      }
-    },
-    "offset": {
-      topic: function(interval) {
-        return interval.offset;
-      },
-      "does not modify the passed-in date": function(offset) {
-        var date = utc(2010, 11, 31, 23, 59, 59, 999);
-        offset(date, +1);
-        assert.deepEqual(date, utc(2010, 11, 31, 23, 59, 59, 999));
-      },
-      "does not round the passed-in-date": function(offset) {
-        assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 999), +1), utc(2011, 00, 07, 23, 59, 59, 999));
-        assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 456), -2), utc(2010, 11, 17, 23, 59, 59, 456));
-      },
-      "allows negative offsets": function(offset) {
-        assert.deepEqual(offset(utc(2010, 11, 01), -1), utc(2010, 10, 24));
-        assert.deepEqual(offset(utc(2011, 00, 01), -2), utc(2010, 11, 18));
-        assert.deepEqual(offset(utc(2011, 00, 01), -1), utc(2010, 11, 25));
-      },
-      "allows positive offsets": function(offset) {
-        assert.deepEqual(offset(utc(2010, 10, 24), +1), utc(2010, 11, 01));
-        assert.deepEqual(offset(utc(2010, 11, 18), +2), utc(2011, 00, 01));
-        assert.deepEqual(offset(utc(2010, 11, 25), +1), utc(2011, 00, 01));
-      },
-      "allows zero offset": function(offset) {
-        assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 999), 0), utc(2010, 11, 31, 23, 59, 59, 999));
-        assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 58, 000), 0), utc(2010, 11, 31, 23, 59, 58, 000));
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/time/weeks-test.js b/test/time/weeks-test.js
deleted file mode 100644
index 7a110a8db8774..0000000000000
--- a/test/time/weeks-test.js
+++ /dev/null
@@ -1,95 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert"),
-    time = require("./time"),
-    local = time.local,
-    utc = time.utc;
-
-var suite = vows.describe("d3.time.weeks");
-
-suite.addBatch({
-  "weeks": {
-    topic: load("time/week").expression("d3.time.weeks"),
-    "returns sundays": function(range) {
-      assert.deepEqual(range(local(2010, 11, 21), local(2011, 0, 12)), [
-        local(2010, 11, 26),
-        local(2011, 0, 2),
-        local(2011, 0, 9)
-      ]);
-    },
-    "has an inclusive lower bound": function(range) {
-      assert.deepEqual(range(local(2010, 11, 21), local(2011, 0, 12))[0], local(2010, 11, 26));
-    },
-    "has an exclusive upper bound": function(range) {
-      assert.deepEqual(range(local(2010, 11, 21), local(2011, 0, 12))[2], local(2011, 0, 9));
-    },
-    "can skip weeks": function(range) {
-      assert.deepEqual(range(local(2011, 0, 1), local(2011, 3, 1), 4), [
-        local(2011, 0, 2),
-        local(2011, 0, 30),
-        local(2011, 1, 27),
-        local(2011, 2, 27)
-      ]);
-    },
-    "observes start of daylight savings time": function(range) {
-      assert.deepEqual(range(local(2011, 2, 1), local(2011, 2, 28)), [
-        local(2011, 2, 6),
-        local(2011, 2, 13),
-        local(2011, 2, 20),
-        local(2011, 2, 27)
-      ]);
-    },
-    "observes end of daylight savings time": function(range) {
-      assert.deepEqual(range(local(2011, 10, 1), local(2011, 10, 30)), [
-        local(2011, 10, 6),
-        local(2011, 10, 13),
-        local(2011, 10, 20),
-        local(2011, 10, 27)
-      ]);
-    },
-    "UTC": {
-      topic: function(range) {
-        return range.utc;
-      },
-      "returns sundays": function(range) {
-        assert.deepEqual(range(utc(2010, 11, 21), utc(2011, 0, 12)), [
-          utc(2010, 11, 26),
-          utc(2011, 0, 2),
-          utc(2011, 0, 9)
-        ]);
-      },
-      "has an inclusive lower bound": function(range) {
-        assert.deepEqual(range(utc(2010, 11, 21), utc(2011, 0, 12))[0], utc(2010, 11, 26));
-      },
-      "has an exclusive upper bound": function(range) {
-        assert.deepEqual(range(utc(2010, 11, 21), utc(2011, 0, 12))[2], utc(2011, 0, 9));
-      },
-      "can skip weeks": function(range) {
-        assert.deepEqual(range(utc(2011, 0, 1), utc(2011, 3, 1), 4), [
-          utc(2011, 0, 2),
-          utc(2011, 0, 30),
-          utc(2011, 1, 27),
-          utc(2011, 2, 27)
-        ]);
-      },
-      "does not observe the start of daylight savings time": function(range) {
-        assert.deepEqual(range(utc(2011, 2, 1), utc(2011, 2, 28)), [
-          utc(2011, 2, 6),
-          utc(2011, 2, 13),
-          utc(2011, 2, 20),
-          utc(2011, 2, 27)
-        ]);
-      },
-      "does not observe the end of daylight savings time": function(range) {
-        assert.deepEqual(range(utc(2011, 10, 1), utc(2011, 10, 30)), [
-          utc(2011, 10, 6),
-          utc(2011, 10, 13),
-          utc(2011, 10, 20),
-          utc(2011, 10, 27)
-        ]);
-      }
-    }
-  }
-});
-
-suite.export(module);
diff --git a/test/time/year-test.js b/test/time/year-test.js
deleted file mode 100644
index 66230f60cba26..0000000000000
--- a/test/time/year-test.js
+++ /dev/null
@@ -1,137 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert");
-
-var suite = vows.describe("d3.time.year");
-
-suite.addBatch({
-  "year": {
-    topic: load("time/year").expression("d3.time.year"),
-    "defaults to floor": function(interval) {
-      assert.strictEqual(interval, interval.floor);
-    },
-    "floor": {
-      topic: function(interval) {
-        return interval.floor;
-      },
-      "returns years": function(floor) {
-        assert.deepEqual(floor(local(2010, 11, 31, 23, 59, 59)), local(2010, 00, 01));
-        assert.deepEqual(floor(local(2011, 00, 01, 00, 00, 00)), local(2011, 00, 01));
-        assert.deepEqual(floor(local(2011, 00, 01, 00, 00, 01)), local(2011, 00, 01));
-      },
-      "correctly handles years in the first century": function(floor) {
-        assert.deepEqual(floor(local(0011, 10, 06, 07)), local(0011, 00, 01));
-      }
-    },
-    "ceil": {
-      topic: function(interval) {
-        return interval.ceil;
-      },
-      "returns years": function(ceil) {
-        assert.deepEqual(ceil(local(2010, 11, 31, 23, 59, 59)), local(2011, 00, 01));
-        assert.deepEqual(ceil(local(2011, 00, 01, 00, 00, 00)), local(2011, 00, 01));
-        assert.deepEqual(ceil(local(2011, 00, 01, 00, 00, 01)), local(2012, 00, 01));
-      }
-    },
-    "offset": {
-      topic: function(interval) {
-        return interval.offset;
-      },
-      "does not modify the passed-in date": function(offset) {
-        var date = local(2010, 11, 31, 23, 59, 59, 999);
-        offset(date, +1);
-        assert.deepEqual(date, local(2010, 11, 31, 23, 59, 59, 999));
-      },
-      "does not round the passed-in-date": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 999), +1), local(2011, 11, 31, 23, 59, 59, 999));
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 456), -2), local(2008, 11, 31, 23, 59, 59, 456));
-      },
-      "allows negative offsets": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 01), -1), local(2009, 11, 01));
-        assert.deepEqual(offset(local(2011, 00, 01), -2), local(2009, 00, 01));
-        assert.deepEqual(offset(local(2011, 00, 01), -1), local(2010, 00, 01));
-      },
-      "allows positive offsets": function(offset) {
-        assert.deepEqual(offset(local(2009, 11, 01), +1), local(2010, 11, 01));
-        assert.deepEqual(offset(local(2009, 00, 01), +2), local(2011, 00, 01));
-        assert.deepEqual(offset(local(2010, 00, 01), +1), local(2011, 00, 01));
-      },
-      "allows zero offset": function(offset) {
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 59, 999), 0), local(2010, 11, 31, 23, 59, 59, 999));
-        assert.deepEqual(offset(local(2010, 11, 31, 23, 59, 58, 000), 0), local(2010, 11, 31, 23, 59, 58, 000));
-      }
-    },
-    "UTC": {
-      topic: function(interval) {
-        return interval.utc;
-      },
-      "defaults to floor": function(interval) {
-        assert.strictEqual(interval, interval.floor);
-      },
-      "floor": {
-        topic: function(interval) {
-          return interval.floor;
-        },
-        "returns years": function(floor) {
-          assert.deepEqual(floor(utc(2010, 11, 31, 23, 59, 59)), utc(2010, 00, 01));
-          assert.deepEqual(floor(utc(2011, 00, 01, 00, 00, 00)), utc(2011, 00, 01));
-          assert.deepEqual(floor(utc(2011, 00, 01, 00, 00, 01)), utc(2011, 00, 01));
-        }
-      },
-      "ceil": {
-        topic: function(interval) {
-          return interval.ceil;
-        },
-        "returns years": function(ceil) {
-          assert.deepEqual(ceil(utc(2010, 11, 31, 23, 59, 59)), utc(2011, 00, 01));
-          assert.deepEqual(ceil(utc(2011, 00, 01, 00, 00, 00)), utc(2011, 00, 01));
-          assert.deepEqual(ceil(utc(2011, 00, 01, 00, 00, 01)), utc(2012, 00, 01));
-        }
-      },
-      "offset": {
-        topic: function(interval) {
-          return interval.offset;
-        },
-        "does not modify the passed-in date": function(offset) {
-          var date = utc(2010, 11, 31, 23, 59, 59, 999);
-          offset(date, +1);
-          assert.deepEqual(date, utc(2010, 11, 31, 23, 59, 59, 999));
-        },
-        "does not round the passed-in-date": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 999), +1), utc(2011, 11, 31, 23, 59, 59, 999));
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 456), -2), utc(2008, 11, 31, 23, 59, 59, 456));
-        },
-        "allows negative offsets": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 01), -1), utc(2009, 11, 01));
-          assert.deepEqual(offset(utc(2011, 00, 01), -2), utc(2009, 00, 01));
-          assert.deepEqual(offset(utc(2011, 00, 01), -1), utc(2010, 00, 01));
-        },
-        "allows positive offsets": function(offset) {
-          assert.deepEqual(offset(utc(2009, 11, 01), +1), utc(2010, 11, 01));
-          assert.deepEqual(offset(utc(2009, 00, 01), +2), utc(2011, 00, 01));
-          assert.deepEqual(offset(utc(2010, 00, 01), +1), utc(2011, 00, 01));
-        },
-        "allows zero offset": function(offset) {
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 59, 999), 0), utc(2010, 11, 31, 23, 59, 59, 999));
-          assert.deepEqual(offset(utc(2010, 11, 31, 23, 59, 58, 000), 0), utc(2010, 11, 31, 23, 59, 58, 000));
-        }
-      }
-    }
-  }
-});
-
-function local(year, month, day, hours, minutes, seconds, milliseconds) {
-  var date = new Date();
-  date.setFullYear(year, month, day);
-  date.setHours(hours || 0, minutes || 0, seconds || 0, milliseconds || 0);
-  return date;
-}
-
-function utc(year, month, day, hours, minutes, seconds, milliseconds) {
-  var date = new Date();
-  date.setUTCFullYear(year, month, day);
-  date.setUTCHours(hours || 0, minutes || 0, seconds || 0, milliseconds || 0);
-  return date;
-}
-
-suite.export(module);
diff --git a/test/time/years-test.js b/test/time/years-test.js
deleted file mode 100644
index 16f61410788bd..0000000000000
--- a/test/time/years-test.js
+++ /dev/null
@@ -1,74 +0,0 @@
-var vows = require("vows"),
-    load = require("../load"),
-    assert = require("../assert");
-
-var suite = vows.describe("d3.time.years");
-
-suite.addBatch({
-  "years": {
-    topic: load("time/year").expression("d3.time.years"),
-    "returns years": function(range) {
-      assert.deepEqual(range(local(2010, 0, 1), local(2013, 0, 1)), [
-        local(2010, 0, 1),
-        local(2011, 0, 1),
-        local(2012, 0, 1)
-      ]);
-    },
-    "has an inclusive lower bound": function(range) {
-      assert.deepEqual(range(local(2010, 0, 1), local(2013, 0, 1))[0], local(2010, 0, 1));
-    },
-    "has an exclusive upper bound": function(range) {
-      assert.deepEqual(range(local(2010, 0, 1), local(2013, 0, 1))[2], local(2012, 0, 1));
-    },
-    "can skip years": function(range) {
-      assert.deepEqual(range(local(2009, 0, 1), local(2029, 0, 1), 5), [
-        local(2010, 0, 1),
-        local(2015, 0, 1),
-        local(2020, 0, 1),
-        local(2025, 0, 1)
-      ]);
-    },
-    "UTC": {
-      topic: function(range) {
-        return range.utc;
-      },
-      "returns years": function(range) {
-        assert.deepEqual(range(utc(2010, 0, 1), utc(2013, 0, 1)), [
-          utc(2010, 0, 1),
-          utc(2011, 0, 1),
-          utc(2012, 0, 1)
-        ]);
-      },
-      "has an inclusive lower bound": function(range) {
-        assert.deepEqual(range(utc(2010, 0, 1), utc(2013, 0, 1))[0], utc(2010, 0, 1));
-      },
-      "has an exclusive upper bound": function(range) {
-        assert.deepEqual(range(utc(2010, 0, 1), utc(2013, 0, 1))[2], utc(2012, 0, 1));
-      },
-      "can skip years": function(range) {
-        assert.deepEqual(range(utc(2009, 0, 1), utc(2029, 0, 1), 5), [
-          utc(2010, 0, 1),
-          utc(2015, 0, 1),
-          utc(2020, 0, 1),
-          utc(2025, 0, 1)
-        ]);
-      }
-    }
-  }
-});
-
-function local(year, month, day, hours, minutes, seconds, milliseconds) {
-  var date = new Date();
-  date.setFullYear(year, month, day);
-  date.setHours(hours || 0, minutes || 0, seconds || 0, milliseconds || 0);
-  return date;
-}
-
-function utc(year, month, day, hours, minutes, seconds, milliseconds) {
-  var date = new Date();
-  date.setUTCFullYear(year, month, day);
-  date.setUTCHours(hours || 0, minutes || 0, seconds || 0, milliseconds || 0);
-  return date;
-}
-
-suite.export(module);