---

CMOD/src/Event.cpp

@@ -390,6 +390,7 @@ void Event::buildChildren() {
     case 3: eventclass = "------L   : ";break;
   }
   //Build the event's children.
+  //cout << "Event::buildChildren - name: " << name << endl;
 
   //Create the event definition iterator.
         /*
@@ -658,10 +659,6 @@ bool Event::buildSweep() {
                 && Utilities::isSieveFunction(childDurationElement)
                 && startType == "1"
                 && durType == "1");
-/*
-cout << boolalpha << align << sieveAligned << endl;
-int sT; cin >> sT;
-*/
 
   // find start time and dur of last child
   if (currChildNum == 0) {
@@ -764,15 +761,16 @@ int sT; cin >> sT;
   }
 
   if(startType == "1" && durType == "1") {
-/*
-cout << "      - previousChildEndTime=" << previousChildEndTime << endl;
-cout << "  " <<endl;
-*/
+
     endTime = Event::verify_valid(previousChildEndTime); 	//missnomer !!
-    tsChild.start = endTime *
+
+//  tsChild.start = endTime *				  SEVER 5/19 2022 
+    tsChild.start = rawChildStartTime *			//SEVER 5/19 2022
         tempo.getEDUDurationInSeconds().To<float>();
     tsChild.startEDU = Ratio((int)rawChildStartTime, 1);
-
+//cout << "FIN: tsChild.start=" << tsChild.start << " endTime=" << endTime << endl;
+//cin >> sT; 
+
     rawChildDuration = endTime - rawChildStartTime;
     int rawChildDurationInt = (int)rawChildDuration;
     tsChild.durationEDU = Ratio(rawChildDurationInt, 1);
@@ -1189,6 +1187,7 @@ int Event::getAvailableEDU()
   int myDurationInt = (int)ts.duration;
   Ratio EDUs;
   float durationScalar;
+
   if(ts.duration == (float)myDurationInt)
   {
     //Since duration is an integer, it may still be possible to have exact EDUs.
@@ -1470,6 +1469,6 @@ int Event::verify_valid(int endTime){
   }
   //cout << "endTime: " << eTime << " high_n: " << valid_time[high] << " low_n: " << valid_time[low] <<  endl;
   int offset = attackSweep[high] - eTime <= eTime - attackSweep[low] ? attackSweep[high] - eTime : attackSweep[low] - eTime;
-  //cout << "endTime: " << endTime << " choose: " << endTime + offset << endl;
+  cout << "endTime: " << endTime << " choose: " << endTime + offset << endl;
   return endTime + offset;
 }

CMOD/src/Matrix.cpp

@@ -179,7 +179,7 @@ void Matrix::setDurations(Sieve* durSieve, int maxVal, vector<Envelope*> durEnvs
 	if(type != oldType) {
 	  cout << "Matrix::setDurations - envelope for type " << type << endl;
 	  durEnvs[type] -> print();
-	  int sever; cin >> sever;
+	  int sever; cin >> sever;  
 	  oldType = type;
         }
 */
@@ -194,6 +194,7 @@ void Matrix::setDurations(Sieve* durSieve, int maxVal, vector<Envelope*> durEnvs
       	     << "][" << durNum << "].stime=" << matr[type][attNum][durNum].stime
 	     << " matr[" << type << "][" << attNum << "][" << durNum
 	     << "].attdurprob=" << matr[type][attNum][durNum].attdurprob << endl;
+	int sever; cin >> sever;  
 */
         if ((   sieveAligned
              && att.count(durEnd % tempo.getEDUPerTempoBeat().Num()) == 0
@@ -247,6 +248,8 @@ MatPoint Matrix::chooseSweep(int remain) {
   return chosenPt;
 }
 
+
+//---------------------------------------------------------------------------//
 MatPoint Matrix::chooseContinuum() {
   return choose();
 }
@@ -419,9 +422,13 @@ int Matrix::verify_valid(int endTime){
       return endTime;
     }
   }
-//cout << "endTime: " << eTime << " high_n: " << valid_time[high] << " low_n: " << valid_time[low] <<  endl;
+/*
+cout << "Matrix:verify_valid - endTime: " << eTime << " high=" << high 
+     << " low=" << low <<  endl;
+//<< " high_n: " << valid_time[high] << " low_n: " << valid_time[low] 
+*/
   int offset = short_attime[high] - eTime <= eTime - short_attime[low] ? short_attime[high] - eTime : short_attime[low] - eTime;
-  //cout << "endTime: " << endTime << " choose: " << endTime + offset << endl;
+//cout << "endTime: " << endTime << " choose: " << endTime + offset << endl;
   return endTime + offset;
 }
 

CMOD/src/Random.cpp

@@ -107,7 +107,7 @@ int Random::RandInt(int lowNum, int highNum) {
 
 //----------------------------------------------------------------------------//
 
-int Random::RandOrderInt(int low, int high, int numChildren, int id) {
+int Random::RandOrderInt(int low, int high, int id) {
   static map<int, vector<int> > choicesMap;
 
   // Initialize choices if a new random order function is found, or

CMOD/src/Random.h

@@ -89,13 +89,11 @@ class Random {
      * 
      * Returns a random integer in the range [low, high].
      * Avoids repetition, given that
-     * - number of children is greater than or equal to
      *   range of [low, high]
-     * - every RandomOrderInt function with range [low, high] and
-     *   numChildren is unique
+     * - every RandomOrderInt function with range [low, high] is unique
      * @param id - Distinguishes between unique calls of the randOrderInt function
      */
-    static int RandOrderInt(int low, int high, int numChildren, int id);
+    static int RandOrderInt(int low, int high, int id);
 
     /**
     *  Randomly chooses a value from a list.

CMOD/src/Utilities.cpp

@@ -704,10 +704,12 @@ Sieve* Utilities::evaluateSieveFunction(string _functionString,void* _object){
 //  cout << "Sieve* Utilities::evaluateSieveFunction - ValuePick" << endl;
     resultSieve = sieve_ValuePick(root, _object);
   }
+/*
   else if (functionName.compare("PREVIOUS_CHILD_DURATION")==0) {
 //  cout << "Sieve* Utilities::evaluateSieveFunction - PREVIOUS " << endl;
      resultSieve = NULL;
   }
+*/
 
   delete parser;
   return resultSieve;
@@ -1111,6 +1113,30 @@ Sieve* Utilities::sieve_ValuePick(DOMElement* _functionElement, void* _object){
                          eMethod.c_str(), wMethod.c_str(),
                          eArgs[0], wArgVect,
                          offsetVect);
+
+/*                      added by Sever
+  vector<int> attTimes;
+  vector<double> attProbs;
+
+  si.FillInVectors(attTimes, attProbs);
+cout << "   sieve_ValuePick - attTimes.size()=" << attTimes.size() << endl;
+  int beatEDUs;
+  beatEDUs = _tempo.getEDUPerTimeSignatureBeat().Num();
+cout << "      beatEDUs=" << beatEDUs << endl;
+
+  for(int i = 0; i < attTimes.size(); i++){
+
+    if(attTimes[i] > eArgs.size()){
+      break;
+    }
+
+ // short_attime.push_back(attTimes[i]);
+    cout << "   attTimes.size=" << attTimes.size() << endl;
+    cout << attTimes[i] << " , ";
+  }
+  cout << endl;
+*/
+
   } else {
     si.Build(minVal, maxVal, eMethod.c_str(), wMethod.c_str(), eArgVect, wArgVect, offsetVect);
   }
@@ -1222,8 +1248,9 @@ string Utilities::function_Select(DOMElement* _functionElement, void* _object){
   char result [50];
 /*
 for(int i=0; i<list.size(); ++i)
-std::cout << list[i] << ' ';
+std::cout << "Utilities::function_Select - list[" << i << "]=" << list[i] << ' ';
 */
+
   sprintf(result, "%f",  evaluate( list[index], _object));
 /*
 cout << "  result= ";
@@ -1307,7 +1334,7 @@ string Utilities::function_RandomOrderInt(DOMElement* _functionElement, void* _o
   int lowBound = (int)evaluate(XMLTranscode(lowBoundElement), _object);
   int highBound = (int)evaluate(XMLTranscode(highBoundElement), _object);
   int id = (int) evaluate(XMLTranscode(idElement), _object);
-  
+/*
   Event* currentEvent = ((Event*)_object);
   int numChildren = currentEvent->getNumberOfChildren();
   string eventName = currentEvent->getEventName();
@@ -1320,9 +1347,9 @@ string Utilities::function_RandomOrderInt(DOMElement* _functionElement, void* _o
          << " This will cause repeated values."
          << endl;
   }
-
+*/
   char result [50];
-  sprintf(result, "%d",  Random::RandOrderInt(lowBound, highBound, numChildren, id));
+  sprintf(result, "%d",  Random::RandOrderInt(lowBound, highBound, id));
   return string(result);
 }