Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
Commits on May 14, 2012
@azmfaridee azmfaridee Updating .gitignore file 7115ed8
Commits on May 20, 2012
@azmfaridee azmfaridee Making the codebase compatible with Xcode 4.3.2 fcc4da7
@azmfaridee azmfaridee merged upstream changes to this fork 9afd400
Commits on May 21, 2012
@azmfaridee azmfaridee issue #14: created a new folder to implement the regulazied random fo…
…rest feature selection algorithm. Once this implementation is complete, we would try to integrate the algorithm to mothur's codebase
937bc27
Commits on May 24, 2012
@azmfaridee azmfaridee issue #14: created file reader class, working on dataset generation c…
…ode and others
82fd670
Commits on May 26, 2012
@azmfaridee azmfaridee added dataset.h e4e5599
@azmfaridee azmfaridee issue #14: added trainingset.h f81693b
@azmfaridee azmfaridee issue #14: minor refactoring 47d0af8
@azmfaridee azmfaridee issue #14: added dataset.h 7a9811d
@azmfaridee azmfaridee issue #14: added trainingset.h 1ceb7a7
@azmfaridee azmfaridee issue #14: minor refactoring 1d00740
@azmfaridee azmfaridee Merge branch 'master' of github.com:darthxaher/mothur 98210e7
@azmfaridee azmfaridee Merge branch 'master' of https://github.com/mothur/mothur 9ef1d9b
Commits on May 27, 2012
@azmfaridee azmfaridee issue #14: Created RegularizedRandomForest class fafd624
@azmfaridee azmfaridee #issue 14: created DecisionTree class 81d4160
@azmfaridee azmfaridee # issue #14: snapshot 6c7d45d
@azmfaridee azmfaridee issue #14: created decisiontree.h and regularizedrandomforest.h file dc50bae
@azmfaridee azmfaridee Formatting 11d0dc1
@azmfaridee azmfaridee issue #14: getting some errors when passing DataSet object to Decisio…
…nTree, most likely associated with shallow copy, need a deep copy operator
5da2541
Commits on May 28, 2012
@azmfaridee azmfaridee issue #14: DecisionTree case does not need the reference of Dataset, …
…removing that.
e6481a1
@azmfaridee azmfaridee issue #14: alignTrainingSets() function added a313bda
@azmfaridee azmfaridee issue #14: DEBUG_INVOCATION macro added. 256a126
@azmfaridee azmfaridee In compiled TrainingSet, outputClass and outputClassId are not matchi…
…ng to each other, this needs to be fixed
1ce45b9
@azmfaridee azmfaridee issue #14: added a new macro, this would make debugging a lot easier d40e551
@azmfaridee azmfaridee issue #14: the problem in which DecisionTree samples were not being c…
…reated properly has been solved
5788605
Commits on May 29, 2012
@azmfaridee azmfaridee issue #14: createBootstrappedSamples() function created and working 7ac382c
@azmfaridee azmfaridee issue #14: added 'copy files' in the project target, datasets are add…
…ed in the source tree too
0ab1dc0
@azmfaridee azmfaridee issue #14: added a few macros and overloaded << operator to easily pr…
…int complex datatypes for easy debugging
f53cb0b
@azmfaridee azmfaridee issue #14: implemented selectFeatureSubsetRandomly() function, notice…
… that this is the basic implementation, we'll make a specialized version for RRF later following the paper
829e640
Commits on Jun 03, 2012
@azmfaridee azmfaridee added a python implementation 365022d
@azmfaridee azmfaridee pyrrf: modified path 25b7bc6
Commits on Jun 04, 2012
@azmfaridee azmfaridee fully implemented splitRecursively() function, tests are pending 03b329f
@azmfaridee azmfaridee printTree() function to visualize tree a bit more easily. 4b4fa53
Commits on Jun 07, 2012
@azmfaridee azmfaridee some minor debugging info added 7cb4baa
@azmfaridee azmfaridee Issue #16: Implemented a new function called findNullFeature(), this …
…function is needed because when we bootstrap the samples, because of the bootstrapping nature, a few feature vectors will end up having a total null value, as a result they adversely affect the entropy calculation logic, these null vectors will be filtered by the mentioned function.
574f59d
Commits on Jun 10, 2012
@azmfaridee azmfaridee Issue #16: Added a simple function getDiscardedFeatureIndices() that …
…will discard the OTUs that have too many zeros. Right now, the function discards any OTU with a total count less than 10, but I think this should be dependent on number of training sets.
d56f6fc
@azmfaridee azmfaridee Merge branch 'master' of https://github.com/mothur/mothur into unstable 42e8bd1
Commits on Jun 11, 2012
@azmfaridee azmfaridee Issue #16: making sure that we do not split on zero value, also added…
… a relatively big dataset to test on.
71fd3c2
Commits on Jun 12, 2012
@azmfaridee azmfaridee Issue #17: Self-explanatory, implemented getStandardDeviation() function 0408bf2
Commits on Jun 13, 2012
@azmfaridee azmfaridee Issue #17: Trying to create both global and local level discarded fea…
…ture list
f0b1e23
@azmfaridee azmfaridee Issue #17: updated the function selectFeatureSubsetRandomly() so that…
… it can work when the number of remaining features are lower than the optimum number.
2ef8096
@azmfaridee azmfaridee Issue #16: Implemented the proper (but a bit slower) way of finding t…
…he split point of a feature. The null left/right child problem is gone now
f4366f5
Commits on Jun 14, 2012
@azmfaridee azmfaridee Issue #16: calcTreeErrorRate() function implemented 5dd8dba
Commits on Jun 15, 2012
@azmfaridee azmfaridee Issue #16: calcTreeVariableImportanceAndError() and randomlyShuffleAt…
…tribute() has been implemented
66be5ad
@azmfaridee azmfaridee Issue #17: Pseudocode for clearTreeData() to minimize some memory usage fdd8912
@azmfaridee azmfaridee Issue #17: Printing variable ranks for a decision tree 3dd7de2
@azmfaridee azmfaridee Issue #17: Suppressed all the info in normal mode, they are only show…
…ed in debug mode
d15aceb
Commits on Jun 17, 2012
@azmfaridee azmfaridee Issue #17: Keeping track of which indices are in training samples and…
… which are in test samples
4ad7044
@azmfaridee azmfaridee Issue #17: updateGlobalOutOfBagEstimates() function implemented. d353816
@azmfaridee azmfaridee Issue #17: calcForrestErrorRate() function implemented. 835340c
@azmfaridee azmfaridee Issue #17: Doing some cleanups fd39887
@azmfaridee azmfaridee Issue #17: Implemented purgeDataSetsFromTree() and purgeTreeNodesData…
…Recursively() to improve memory efficiency.
298ef34
@azmfaridee azmfaridee Issue #17: calcForrestVariableImportance() function implemented. 3c3f370
Commits on Jun 18, 2012
@azmfaridee azmfaridee Issue #19: Adding outin.final.an.0.03.subsample.avg.matrix dataset 13d00dd
@azmfaridee azmfaridee Issue #19: minor fix 34d1024
Commits on Jul 01, 2012
@azmfaridee azmfaridee Issue #20: removed some wrong import 86c14ed
@azmfaridee azmfaridee Issue #20: created fileReaderFactory to handle two type of files. aa3c1d2
@azmfaridee azmfaridee Issue #20: OptimumFeatureSubsetSelector class implemented, the number…
… of features selected in each split now can be fine tuned between log2 and square root of number of features
e2e48d7
@azmfaridee azmfaridee Issue #20: getGlobalDiscardedFeatureIndices() function moved to Rando…
…mForest class
9fe31b0
@azmfaridee azmfaridee Issue #20: RegularizedRandomForest class is being extended from Abstr…
…actRandomForest
50d44ed
@azmfaridee azmfaridee Issue #20: incorporated AbstractDecisionTree so that we can easily bu…
…ild RegularizedDecisionTree on top of it.
0fbf638
@azmfaridee azmfaridee Issue #20: some minor rearrangements. 64b9d76
Commits on Jul 03, 2012
@azmfaridee azmfaridee Issue #20: just copying some old codes to new class as placeholder 6efdaf3
Commits on Jul 04, 2012
@azmfaridee azmfaridee Issue #20: getStandardDeviation() function has been moved to Utils cl…
…ass as static method
eb276bb
Commits on Jul 05, 2012
@azmfaridee azmfaridee Issue #22: keeping track of parent node b95b360
@azmfaridee azmfaridee Issue #22: updateNodeEntropy() function implemented that calculated a…
… nodes own entropy
85e7a95
@azmfaridee azmfaridee Issue #22: minor re-fractoring 5c472af
@azmfaridee azmfaridee Issue #22: splitCriterion parameter added to RandomForest class e0ed188
@azmfaridee azmfaridee Issue #20: removed already done TODO list 6555d18
@azmfaridee azmfaridee Issue #20: splitInformationGain added in TreeNode f4818dd
Commits on Jul 07, 2012
@azmfaridee azmfaridee Issue #22: 'gainRatio' can now also be used for tree splitting criter…
…ia as well as normal 'information gain'. The heuristic that mentioned in the book by Mitchell has not been implemented yet.
8bba292
Commits on Jul 08, 2012
@azmfaridee azmfaridee Issue #20: Integrating an almost working prototype of RegularizedRand…
…omForest implementation, there are still some parts that are not working as expected.
d3ceade
Commits on Jul 10, 2012
@azmfaridee azmfaridee Merge remote-tracking branch 'upstream/master' 4bf7485
Commits on Jul 20, 2012
@azmfaridee azmfaridee Issue #23: creating a C style matrix from the inpatient data, fist ne…
…ed to port the code to C++ asap, then will come back to handing of input in mothur
64bda94
Commits on Jul 22, 2012
@azmfaridee azmfaridee Issue #23: minor refactoring in the dataSet file 724aaf1
@azmfaridee azmfaridee Issue #23: getOptimumFeatureSubsetSize() function ported + some helpe…
…r functions to help with the debugging.
9994655
@azmfaridee azmfaridee Issue #23: Implementing TreeNode class 23b70d5
@azmfaridee azmfaridee Issue #23: implementing AbstractDecisionTree class 85fce5f
@azmfaridee azmfaridee Issue #23: Implementing AbstractRandomForest class 4d290bb
@azmfaridee azmfaridee Issue #23: creating RandomForest class 5f07cd5
@azmfaridee azmfaridee Issue #23: changes in the main project files. 6626ebd
@azmfaridee azmfaridee Issue #23: TreeNode class ported successfully f211fe2
@azmfaridee azmfaridee Issue #23: minor refactoring f7f3821
Commits on Jul 23, 2012
@azmfaridee azmfaridee Issue #23: fixing integer division with casting to double 8025e6b
@azmfaridee azmfaridee Issue #23: minor refactoring in the python code 9bb39db
@azmfaridee azmfaridee Issue #23: including limits.h header 34d33e3
@azmfaridee azmfaridee Issue #23: correcting numFeatures value 058e69f
@azmfaridee azmfaridee Issue #23: createBootStrappedSamples() ported successfully 9c31dfc
@azmfaridee azmfaridee Issue #23: calcIntrinsicValue() ported 63f8fb8
@azmfaridee azmfaridee Issue #23: getBestSplitAndMinEntropy() ported 91981f9
@azmfaridee azmfaridee Issue #23: getMinEntropyOfFeature() ported 13aa236
@azmfaridee azmfaridee Issue #23: getSplitPopulation() ported c2d29b8
@azmfaridee azmfaridee Issue #23: minor refactoring b4e64a1
@azmfaridee azmfaridee Issue #23: creating getters in TreeNode class 96cfef0
@azmfaridee azmfaridee Issue #23: checkIfAlreadyClassified() ported. 6cd079f
@azmfaridee azmfaridee Issue #23: minor refactoring in python code 6f5b078
Commits on Jul 24, 2012
@azmfaridee azmfaridee Issue #23: DecisionTree class file renamed to .hpp from .h 81d5300
@azmfaridee azmfaridee rootNode pointer clear removed form destructor, it should be done fro…
…m subclasses
e2bfed9
@azmfaridee azmfaridee DecisionTree class changed to newest spec, now it extends AbstractDec…
…isionTree. printTree() function ported but needs thorough check.
7621a4e
@azmfaridee azmfaridee adding more getters in TreeNode class 8bebb70
@azmfaridee azmfaridee minor change in the rrf-fs-prototype.cpp file 6d92c76
@azmfaridee azmfaridee Issue #23: adding a DEBUGMSG macro 9b98d7a
@azmfaridee azmfaridee Issue #23: minor refactoring in python code cbc948f
@azmfaridee azmfaridee Issue #23: adding more setters in TreeNode class 01b5a79
@azmfaridee azmfaridee Issue #23: selectFeatureSubsetRandomly() function ported e2ba1fa
@azmfaridee azmfaridee Issue #23: adding more getters and setters 71fafb8
@azmfaridee azmfaridee Issue #23: splitRecursively() function ported dedbd16
@azmfaridee azmfaridee Issue #23: removing TODO list b5d0597
@azmfaridee azmfaridee Issue #23: findAndUpdateBestFeatureToSplitOn() ported, fixed the issu…
…e of gainRatio entropy update
2d83b3c
@azmfaridee azmfaridee Issue #23: updated the code after solving the gainRatio entropy bug 07d740f
@azmfaridee azmfaridee Issue #23: updating setter and getters in TreeNode class dcd4c89
@azmfaridee azmfaridee Issue #24: calcTreeVariableImportanceAndError() ported 80ec697
@azmfaridee azmfaridee Issue #24: PRINT_VAR macro added d7f1340
@azmfaridee azmfaridee Issue #24: some comments cc0551e
@azmfaridee azmfaridee Issue #24: some test code for playing out with 2d sorting 06cb3af
@azmfaridee azmfaridee Issue #24: better 2d vector initialization 18de5e1
@azmfaridee azmfaridee Issue #24: creating more method stubs c22ae10
Commits on Jul 25, 2012
@azmfaridee azmfaridee Issue #24: declaring DecisionTree as friend class to facilitate easie…
…r access, need to remove this later on, right now trying to get the c++ code working
6c08219
@azmfaridee azmfaridee Issue #24: evaluateSample() function ported 0ebf4a0
@azmfaridee azmfaridee Issue #24: calcTreeErrorRate() function ported 423cf2a
@azmfaridee azmfaridee Issue #24: purgeDataSetsFromTree() function ported 7a97189
@azmfaridee azmfaridee Issue #24: outOfBagEstimates map<int, int> added cf3f411
@azmfaridee azmfaridee Issue #24: recursive deletion of the tree (TreeNode) implemented ea5e9fa
@azmfaridee azmfaridee Issue #24: some minor formatting changes c78ac00
Commits on Jul 29, 2012
@azmfaridee azmfaridee Issue #24: overriding cout for map<int, vector<int> > 3dd7163
@azmfaridee azmfaridee Issue #24: fix typo in pyrrf.py af7c539
@azmfaridee azmfaridee Issue #24: adding more debug levels. overriding cout for map<int, int>. 5b13442
@azmfaridee azmfaridee Issue #24: some debugging info print in TreeNode class. also making t…
…he destructor virtual in case we need to extend TreeNode.
a8fdd1d
@azmfaridee azmfaridee Issue #24: finishing up getBestSplitAndMinEntropy() function porting c996e83
@azmfaridee azmfaridee Issue #24: some debugging print in AbstractDecisionTree class ff38d5f
@azmfaridee azmfaridee Issue #24: making two methods public from private in DecisionTree class 5d26902
@azmfaridee azmfaridee Issue #24: making RandomForest friend class of DecisionTree class c331aa8
@azmfaridee azmfaridee issue #24: initializing globalVariableImportanceList in the construct…
…or. declaring pure virtual functions. Introducing FEATURE_DISCARD_SD_THRESHOLD for comparing standard deviation when creating discardedFeatureIndices
808aaa6
@azmfaridee azmfaridee Issue #24: fixed the bug in variableImportantList calculation. making…
… DecisionTree destructor virtual
51da668
@azmfaridee azmfaridee Issue #24: adding/modifying some debugging related code ec1992e
@azmfaridee azmfaridee Issue #24: solving two bugs. 1. empty variableRanks. 2. segmentation …
…fault in matrix transpose in randomlyShuffleAttribute function due to wrong index increment.
c52647f
@azmfaridee azmfaridee Issue #24: we keep a vector<AbstractDecisionTree*> to keep the list o…
…f AbstractDecisionTrees
02b8f8a
@azmfaridee azmfaridee Issue #24: porting of RandomForest class complete ce24923
@azmfaridee azmfaridee Issue #24: proper calling of the RandomForest object in the main func…
…tion
8cd06fe
@azmfaridee azmfaridee Merge remote-tracking branch 'upstream/master' 298f73e
@azmfaridee azmfaridee renamed the folder from 'rrf-fs-prototype' to just 'fs' 08e8a7e
Commits on Jul 30, 2012
@azmfaridee azmfaridee Issue #24: moving old codes that are no longer used in the project to…
… old-code folder for backup purpose, these will be eventually be deleted
e01e56c
@azmfaridee azmfaridee Issue #24: code cleanup and removing warnings 18ca4a6
@azmfaridee azmfaridee Issue #24: renaming main file 72a693c
@azmfaridee azmfaridee Issue #24: changing project name to randomforest 40df82f
@azmfaridee azmfaridee Issue #24: minor changes and comments de4dbd9
Commits on Aug 02, 2012
@azmfaridee azmfaridee Issue #25: python code file renamed 882561b
@azmfaridee azmfaridee Issue #24: removing all unsigned types, in some cases the comparison …
…with a (valid) negative number with unsigned integer would create an infinite loop.
bb96ad4
Commits on Aug 08, 2012
@azmfaridee azmfaridee Issue #20: [python] updateOutputClassOfNode() function implemented, i…
…t will help in pruning algorithm
d77ea2e
@azmfaridee azmfaridee Issue #25: [c++] some debugging level change f1def50
@azmfaridee azmfaridee Issue #25: [c++] returning value instead of references in atomic data…
…types
ad664b8
Commits on Aug 09, 2012
@azmfaridee azmfaridee Issue #20: [python] testSampleMisclassificationCount printed in the o…
…utput + some function call parameter change
242f542
@azmfaridee azmfaridee Issue #20: [python] updateMisclassificationCountRecursively() impleme…
…nted
22b12e5
@azmfaridee azmfaridee Issue #20: [python] pruneRecursively() function implemented 8b53945
@azmfaridee azmfaridee Issue #20: [python] implemented pruneAggressiveness parameter 0614c00
Commits on Aug 10, 2012
@azmfaridee azmfaridee issue #25: [python] calcTreeVariableImportanceAndError() function opt…
…imized by 1. using globalDiscardedFeatureIndices 2. using standard deviation to remove a lot of null features from importance calculation. end result is the average running time in python has reduced from 8s to 6s
84062ce
@azmfaridee azmfaridee Issue #20: [python] default pruneAggressiveness is set to 0.9. this s…
…eems to be giving more consistant results than more aggressive value of 1
9a71fcc
@azmfaridee azmfaridee Issue #20: [python] pruning criteria can be defined at the constructo…
…r of RandomForest
3fd2fec
@azmfaridee azmfaridee Issue #20: [python] implemented a mechanism where highly erroneous tr…
…ess are automatically discarded (error threshold defaults to 40% now).
8938925
@azmfaridee azmfaridee Issue #25: [python] debugging info is now categorized under different…
… debugging levels
33b4222
@azmfaridee azmfaridee Issue #25: [python] debugging info is now categorized under different…
… debugging levels
a8188fe
@azmfaridee azmfaridee Merge branch 'unstable' of github.com:darthxaher/mothur into unstable
Conflicts:
	fs/randomforest.py
22968bd
@azmfaridee azmfaridee Issue #25: [python] optimumFeatureSubsetSelectionCriteria can be give…
…n at the beginning of randomForest constructor
e79e416
@azmfaridee azmfaridee Issue #25: [python] more refined debug levels 69f125d
@azmfaridee azmfaridee Issue #25: [python] avgErrorRateImprovement is being calculated 0750af2
@azmfaridee azmfaridee Issue #25: [python] experiment with deepcopy c56a142
@azmfaridee azmfaridee Issue #25: [python] handling too few trees 372d7ae
@azmfaridee azmfaridee Issue #25: [python] created automatic setting to guess numDecisionTre…
…es, very rough guess
1a83c5d
Commits on Aug 11, 2012
@azmfaridee azmfaridee Issue #25: [data] adding HumanCRC.final.subsample.shared dataset 9c52c8b
@azmfaridee azmfaridee Issue #25: [python] adding HumanCRC.final.subsample.shared entry in t…
…he python code
06deb69
@azmfaridee azmfaridee Issue #25: [python] added standard deviation calculation to each of t…
…he features
58f2fdd
@azmfaridee azmfaridee Issue #25: [python] new tunable parameter featureStandardDeviationThr…
…eshold implemented
e89d929
Commits on Aug 12, 2012
@azmfaridee azmfaridee Issue #25: [python] whitespaces 4c504d1
@azmfaridee azmfaridee Issue #25: [python] numSamplesPerFeatures parameter printed 594e363
Commits on Aug 13, 2012
@azmfaridee azmfaridee Issue #25: [c++] added mock c++ class to mothur: ClassifySharedComman…
…d. updated setParameters() function
a74a90f
@azmfaridee azmfaridee Issue #25: [c++] [integration] some more method stubs 20d1f40
@azmfaridee azmfaridee Issue #25: [c++] [integration] added classify.shared command referenc…
…e to commandfactory.cpp file
797d689
Commits on Aug 19, 2012
@azmfaridee azmfaridee Issue #25: [c++] [integration] finishing up the integration 6c81ab6
@azmfaridee azmfaridee Issue #25: [c++] [integration] splitcriteria and otupersplit paramete…
…rs handled
6b4d3fd
Commits on Aug 22, 2012
@azmfaridee azmfaridee Issue #25: [c++] [integration] handling of inputDir and outputDir (pa…
…rtially)
2bb625d
Commits on Aug 23, 2012
@azmfaridee azmfaridee Issue #25: [c++] [integration] enabling code for SharedRAbundVector 0e6e8fc
@azmfaridee azmfaridee Issue #25: [c++] [integration] re-indenting some of the codes for bet…
…ter readability
5e32feb
Commits on Aug 27, 2012
@azmfaridee azmfaridee Issue #25: [c++] [integration] we can now call random forest code fro…
…m within mothur
9dbe587
Commits on Sep 08, 2012
@azmfaridee azmfaridee Issue #28: [c++] [integration] translating the codes to mothurOut doe…
…s not work, still adding those codes for future references as comments
68fce29
@azmfaridee azmfaridee Issue #20: [c++] [integration] other random forest parameters now wor…
…k inside mothur, plus added mothurOut class in all of the RF classes to easy debug message anywhere
598e71e
Commits on Sep 30, 2012
@azmfaridee azmfaridee upgraded project settings to Xcode 4.5 in Lion c9c39c4
@azmfaridee azmfaridee Merge remote-tracking branch 'upstream/master' 9247c55
Commits on Oct 17, 2012
@azmfaridee azmfaridee Merge remote-tracking branch 'upstream/master' into integration
Conflicts:
	Mothur.xcodeproj/project.pbxproj
	classifysharedcommand.cpp
	classifysharedcommand.h
c5af7f8
@azmfaridee azmfaridee removal of prototype codes 51c3128
@azmfaridee azmfaridee fix compilation problems by removing duplicate references 2fc5d5f
@azmfaridee azmfaridee better looking ifdefs 9d8ea2e
Commits on Dec 01, 2012
@azmfaridee azmfaridee Merge remote-tracking branch 'upstream/master' into integration
Conflicts:
	.gitignore
	Mothur.xcodeproj/project.pbxproj
0e28453
Commits on Dec 18, 2012
@azmfaridee azmfaridee Merge remote-tracking branch 'upstream/master'
Conflicts:
	classifysharedcommand.h
0357f64
Commits on Dec 30, 2012
@azmfaridee azmfaridee Merge remote-tracking branch 'upstream/master' 1180694
@azmfaridee azmfaridee Issue #30: removing unused abstractrandomforst.cpp/hpp files. Adding …
…additional parameters for pruning system in the constructor
74bbac2
@azmfaridee azmfaridee Issue #30: more changes in associated constructors, removing old 3 pa…
…rameter constructor in favour of new 9 param constructor
d0c87fa
Commits on Jan 06, 2013
@azmfaridee azmfaridee Issue #30: adding some default values to the parameters 3b33700
Commits on Mar 12, 2013
@azmfaridee azmfaridee Revert "Issue #30: adding some default values to the parameters"
This reverts commit 3b33700.
9c9c142
@azmfaridee azmfaridee Revert "Issue #30: more changes in associated constructors, removing …
…old 3 parameter constructor in favour of new 9 param constructor"

This reverts commit d0c87fa.
7a893bc
@azmfaridee azmfaridee Revert "Issue #30: removing unused abstractrandomforst.cpp/hpp files.…
… Adding additional parameters for pruning system in the constructor"

This reverts commit 74bbac2.
f7d5e41
@azmfaridee azmfaridee Merge branch 'master' of https://github.com/mothur/mothur
Conflicts:
	.gitignore
	Mothur.xcodeproj/project.pbxproj
374459c
Commits on Mar 13, 2013
@azmfaridee azmfaridee Merge remote-tracking branch 'upstream/master' 871aa1f
@azmfaridee azmfaridee removing abstractrandomforest.cpp and abstractrandomforest.hpp file 7372b42
@azmfaridee azmfaridee adding back pruning related parameters e302bd3
Commits on Mar 20, 2013
@azmfaridee azmfaridee pruning mechanism implemented, compiles perfectly but has segmentatio…
…n faults. Needs a review.
35caa59
Commits on Mar 21, 2013
@azmfaridee azmfaridee pruning: the program runs fine now, but the results are unsatisfactor…
…y, there must be some kind of mistake in calculation of values
1f27a4c
@azmfaridee azmfaridee fixed wrong error rate calculation 92b1eda
@azmfaridee azmfaridee fixed average error rate improvement calculation 7c17320
Commits on Apr 02, 2013
@azmfaridee azmfaridee added parameters in ClassifySharedCommand class for user defined input 3f14af0
@azmfaridee azmfaridee random forest is now taking full parameter list from console, plus a …
…"gainratio" is the default tree split system
bce554f
@azmfaridee azmfaridee some fix in debug msg printout 5b870c8
@azmfaridee azmfaridee bug fixed that was miscalculating error rates to negative value 87d12fb
@azmfaridee azmfaridee replaced double vectors with vectors of pairs, giving us quite a bit …
…of performance improvement.
7986695
@azmfaridee azmfaridee some more performance improvements with pair<> 1a59431
Commits on Apr 03, 2013
@azmfaridee azmfaridee 9 sec performance improvement (500 tree) by removing repeated created…
… of 2d vectors
6673fab
@azmfaridee azmfaridee baseDataSet was changed to a reference to minimise memory copy c750d7d
Commits on May 02, 2013
@azmfaridee azmfaridee Merge branch 'upstream-master'
Conflicts:
	abstractrandomforest.cpp
13084f0
Commits on May 23, 2013
@azmfaridee azmfaridee Merge branch 'upstream-master' 058165f
@azmfaridee azmfaridee Merge branch 'upstream-dev-ml'
Conflicts:
	classifysharedcommand.cpp
	randomforest.cpp
4502356
@azmfaridee azmfaridee Implemented a function to calculate F-Score, integration pending. F-S…
…core can be used to replace the rudimentary standard deviation based feature discarding.

TODO: need to compare the F-Score with globalDiscardedFeatureIndices to check their similarity.
8962940
@azmfaridee azmfaridee Merge branch 'master' into tmp
Conflicts:
	randomforest.cpp
c872f42
@azmfaridee azmfaridee fixing command factory duplicate entry of classify.shared portions d3239bb
@azmfaridee azmfaridee reenabling the destructor to enable deletion of dynamically allocated…
… memorey.
e1b9751
Commits on Jul 18, 2013
@rafi-kamal rafi-kamal Merge remote-tracking branch 'upstream/master' into dev 38cbd8a
Commits on Jul 19, 2013
@rafi-kamal rafi-kamal files for eclipse CDT 0de50ba
@rafi-kamal rafi-kamal function for calculating confusion matrix added 9147f64
Commits on Jul 22, 2013
@kdiverson kdiverson Merge pull request #43 from rafi-kamal/dev
Confusion Matrix Implementation
0ebe7d3