← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/python-scipy/oneiric-proposed

« back to all changes in this revision

Viewing changes to scipy/cluster/vq.py

  • Committer: Bazaar Package Importer
  • Author(s): Sameer Morar
  • Date: 2011-02-03 04:28:09 UTC
  • mfrom: (9.1.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20110203042809-qs95kuod7723re62
Tags: 0.8.0+dfsg1-1ubuntu1
https://launchpad.net/bugs/696403
* Merge from debian experimental (LP: #696403). Remaining changes:
  - debian/patches/stdc_format_macros.patch: Fix FTBFS issue with python 2.7

Show diffs side-by-side

added added

removed removed

Lines of Context:
scipy/cluster/vq.py
485
485
        result = _kmeans(obs, guess, thresh = thresh)
486
486
    else:
487
487
        #initialize best distance value to a large value
488
 
        best_dist = 100000
 
488
        best_dist = np.inf
489
489
        No = obs.shape[0]
490
490
        k = k_or_guess
491
491
        if k < 1: