- data = estimate->getValues(shared1, shared2); //passes estimators a shared vector from each group to be compared
- //fills groupdata with datas info
- for (int i = 0; i < data.size(); i++) {
- groupData.push_back(data[i]);
+ data = estimate->getValues(shared); //passes estimators a shared vector from each group to be compared
+
+ //figure out what groups are being compared in getValues
+ //because we randomizes the order we need to put the results in the correct column in the output file
+ int group1Index, group2Index, pos;
+ group1Index = shared[0]->getGroupIndex();
+ group2Index = shared[1]->getGroupIndex();
+
+ numGroupComb = 0;
+ int n = 1;
+ for (int i = 0; i < (numGroups - 1); i++) {
+ for (int l = n; l < numGroups; l++) {
+ if ((group1Index == i) && (group2Index == l)) {
+ pos = numGroupComb; //pos tells you which column in the output file you are in
+ }else if ((group1Index == l) && (group2Index == i)) {
+ pos = numGroupComb;
+ }
+ numGroupComb++;
+ }
+ n++;
+ }
+
+ if ((estimate->getMultiple() == true) && all) {
+ numGroupComb++;
+ groupData.resize((numGroupComb*data.size()), 0);
+ //is this the time its called with all values
+ if ((timesCalled % numGroupComb) == 0) {
+ //last spot
+ pos = ((groupData.size()-1) * data.size());
+ }
+ //fills groupdata with datas info
+ for (int i = 0; i < data.size(); i++) {
+ groupData[pos+i] = data[i];
+ }
+ }else {
+ groupData.resize((numGroupComb*data.size()), 0);
+ //fills groupdata with datas info
+ for (int i = 0; i < data.size(); i++) {
+ groupData[pos+i] = data[i];
+ }