X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/e45bacc6bd342a1b19e42b62133ddabc99aa9edd..8fb3c55ee009a11db5e1c08a4cfb286979412745:/BlockImplementation.h

diff --git a/BlockImplementation.h b/BlockImplementation.h
index aa08ed9..a9a5249 100644
--- a/BlockImplementation.h
+++ b/BlockImplementation.h
@@ -35,42 +35,40 @@ public:
   inline QHash<QString,QString> getConsumptionPattern() { return consumptionPattern; }
   inline QHash<QString,QString> getProductionPattern() { return productionPattern; }
   inline QString getProductionCounter() { return productionCounter; }
+  inline QList<QString> getResources() { return resources; }
+
   // setters
   inline void setDelta(QString _delta) { delta = _delta; }
   inline void setConsumptionPattern(QHash<QString,QString> pattern) { consumptionPattern = pattern; }
   inline void setProductionPattern(QHash<QString,QString> pattern) { productionPattern = pattern; }
   inline void setProductionCounter(QString pattern) { productionCounter = pattern; }
   
-  QString eval(QString line, QTextStream& out);
-  QString evalComplex(QString line, int num);
-  QString evalString(QString s);
-  QList<AbstractInterface*>* evalStringComplex(QString s);
-  QString evalValue(QString s);
-  QString calculateWidth(QString s);
+  // testers
+
+  inline bool hasNoPatterns() { return noPatterns; }
 
   inline void setReference(ReferenceBlock* _reference) { reference = _reference; }
 
   void loadPatterns(QDomElement &root) throw(Exception);
   bool checkPatterns();  
   
-  inline void addSource(QString file) { sources.append(file); }
+  inline void addResource(QString file) { resources.append(file); }
 private:  
   QString xmlFile;
   QString referenceXml;
   QString referenceMd5;
 
-  QList<QString> sources;
+  QList<QString> resources;
 
   QMap<QString, int> paramMap;
   ArithmeticEvaluator* evaluator;
   ReferenceBlock* reference;
   FunctionalBlock* block; // the current functional block for which this implementation is used.
+  bool noPatterns;
   QString delta;
   QHash<QString,QString> consumptionPattern; // key = reference interface name, value = pattern expression
   QHash<QString,QString> productionPattern; // key = reference interface name, value = pattern expression
-  QString productionCounter;
-
-  QString getIfaceUserName(AbstractInterface* refIface); // get the name of an interface given by the user, from the reference interface
+  QString productionCounter;  
 
   friend QDataStream &operator<<(QDataStream &out, const BlockImplementation &impl);
   friend QDataStream &operator>>(QDataStream &in, BlockImplementation &impl);