Some linting and refactoring 1 Updated doc strings, removed print statements and updated documentation 2 Refactored checkCriteriaB to be generic function checkCriteria 3 Also fixed findPrecipRate
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/aed34f0b Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/aed34f0b Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/aed34f0b Branch: refs/heads/master Commit: aed34f0b8135694d4cc3e97d8f5960b89343f1c2 Parents: 5f3a852 Author: kwhitehall <[email protected]> Authored: Sun Apr 13 08:55:11 2014 -0400 Committer: kwhitehall <[email protected]> Committed: Sun Apr 13 08:55:11 2014 -0400 ---------------------------------------------------------------------- mccsearch/README.docx | Bin 0 -> 195234 bytes mccsearch/code/mainProg.py | 19 +- mccsearch/code/mccSearch.py | 1833 +++++++++++--------------------------- 3 files changed, 531 insertions(+), 1321 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/aed34f0b/mccsearch/README.docx ---------------------------------------------------------------------- diff --git a/mccsearch/README.docx b/mccsearch/README.docx new file mode 100644 index 0000000..a0a7d1e Binary files /dev/null and b/mccsearch/README.docx differ http://git-wip-us.apache.org/repos/asf/climate/blob/aed34f0b/mccsearch/code/mainProg.py ---------------------------------------------------------------------- diff --git a/mccsearch/code/mainProg.py b/mccsearch/code/mainProg.py index 37e1cc8..90fb76d 100644 --- a/mccsearch/code/mainProg.py +++ b/mccsearch/code/mainProg.py @@ -26,7 +26,7 @@ def main(): allCETRMMList =[] subprocess.call('export DISPLAY=:0.0', shell=True) - mainDirStr= "/Users/kimwhitehall/Documents/HU/research/thesis/presentation/caseStudies/BFStudy" + mainDirStr= "/Users/kimwhitehall/Documents/HU/research/thesis/presentation/caseStudies/BFStudy1" #mainDirStr= "/home/whitehal/mccsearch/caseStudy2" #directories for the original data #TRMMdirName ="/home/whitehal/summer2006TRMM" @@ -55,15 +55,12 @@ def main(): mergImgs, timeList = mccSearch.readMergData(CEoriDirName) print ("-"*80) - print 'in main', len(mergImgs) - print 'timeList', timeList - print 'TRMMdirName ', TRMMdirName print "\n -------------- TESTING findCloudElements ----------" CEGraph = mccSearch.findCloudElements(mergImgs,timeList,TRMMdirName) #if the TRMMdirName isnt entered for what ever reason # CEGraph = mccSearch.findCloudElements(mergImgs,timeList) - # allCETRMMList=mccSearch.findPrecipRate(TRMMdirName) - # sys.exit() + # allCETRMMList=mccSearch.findPrecipRate(TRMMdirName,timeList) + #sys.exit() print ("-"*80) print "number of nodes in CEGraph is: ", CEGraph.number_of_nodes() print ("-"*80) @@ -95,11 +92,11 @@ def main(): print ("-"*80) #print "MCCTimes is: ", MCCTimes #mccSearch.plotAccTRMM(MCCList) - mccSearch.displayPrecip(MCCList) - mccSearch.plotAccuInTimeRange('2009-09-01_00:00:00', '2009-09-01_23:00:00') - mccSearch.displaySize(MCCList) - mccSearch.displayPrecip(MCCList) - mccSearch.plotHistograms(MCCList) + # mccSearch.displayPrecip(MCCList) + # mccSearch.plotAccuInTimeRange('2009-09-01_00:00:00', '2009-09-01_23:00:00') + # mccSearch.displaySize(MCCList) + # mccSearch.displayPrecip(MCCList) + # mccSearch.plotHistogram(MCCList) print "creating the MCC userfile ", mccSearch.createTextFile(MCCList,1) print "creating the MCS userfile ", mccSearch.createTextFile(MCSList,2)
