Changeset 555 in Sophya for trunk/Poubelle/archTOI.old/toiderivproducer.cc

Timestamp:

Nov 9, 1999, 3:04:05 PM (26 years ago)

Author:

ansari

Message:

portage cxx en cours

File:

• trunk/Poubelle/archTOI.old/toiderivproducer.cc (modified) (8 diffs)

trunk/Poubelle/archTOI.old/toiderivproducer.cc

@@ -6 +6 @@
 #include "archexc.h"
 #include "requesthandler.h"
+#include "subsets.h"
 
 set<TOI> TOIDerivProducer::reqTOIFor(TOI const&) { 
@@ -61 +62 @@
   }
   
+  set<string> unusedextra = extraopts;
+  
   // 4. Find producers, distribute remaining options
   map<TOI, TOIProducer*> fullInputTOI;
@@ -66 +69 @@
   for (set<TOI>::iterator i = inputTOIs.begin(); i != inputTOIs.end(); i++) {
     TOI inTOI = *i;
-    TOIProducer* prod = TOIManager::findTOIProducer(inTOI);
+    //TOIProducer* prod0 = TOIManager::findTOIProducer(inTOI);
+    // Let's see if we get others with options, we have to do this because
+    // of required options, and we have to iterate over all subsets of the options.
+    // This algorithm is NOT correct, but should work for realistic cases...
+    int nmaxopt=-1;
+    TOIProducer* prod=NULL;
+    set<set<string> > optsets = getSetOfSubsets(extraopts);
+    for (set<set<string> >::iterator j = optsets.begin(); j != optsets.end(); j++) {
+      TOI toi2 = inTOI;
+      toi2.options.insert((*j).begin(), (*j).end());
+      TOIProducer* prod0 = TOIManager::findTOIProducer(toi2);
+      if (prod0 == NULL) continue;
+      if ((long) toi2.options.size() > nmaxopt) {
+        prod = prod0;
+        nmaxopt = toi2.options.size();
+      }
+    }
     if (!prod) return false;
     if (!extraopts.empty()) {
@@ -73 +92 @@
         if (extraopts.find(*j) != extraopts.end()) {
           inTOI.options.insert(*j);
-          extraopts.erase(*j);
+          unusedextra.erase(*j);
         }
       }
@@ -80 +99 @@
   }
   
-  if (!extraopts.empty()) return false;
+  if (!unusedextra.empty()) return false;
   
   neededTOIs[toi] = fullInputTOI;
@@ -91 +110 @@
  // if (!canProduce(toi)) throw ArchExc("cannot produce " + toi.name);
   set<string> s = getProperAvailOptions(toi);
-  map<TOI, TOIProducer*> need = neededTOIs[toi];
+  map<TOI, TOIProducer*> & need = neededTOIs[toi];
   for (map<TOI, TOIProducer*>::iterator i = need.begin(); i != need.end(); i++) {
     set<string> s1 = (*i).second->getAvailOptions((*i).first);
@@ -101 +120 @@
 void TOIDerivProducer::addTOI(TOI& toi, TOIAbsorber* client) {
   TOIProducer::addTOI(toi, client);
-  map<TOI, TOIProducer*> m = neededTOIs[toi];
+  map<TOI, TOIProducer*> & m = neededTOIs[toi];
   for (map<TOI, TOIProducer*>::iterator i = m.begin(); i != m.end(); i++) {
     TOI toi2 = (*i).first;
@@ -117 +136 @@
 void TOIDerivProducer::propagateLowBound(TOI const& toi, long sampleNum) {
   CHKPROD
-  map<TOI, TOIProducer*> need = neededTOIs[toi];
+  map<TOI, TOIProducer*> & need = neededTOIs[toi];
   for (map<TOI, TOIProducer*>::iterator i = need.begin(); i != need.end(); i++) {
     (*i).second->wontNeedEarlier((*i).first, this, sampleNum);