[Avida-SVN] r2735 - in branches/uml-merge: Avida.xcodeproj source/orchid
dk at myxo.css.msu.edu
dk at myxo.css.msu.edu
Wed Jul 30 09:40:27 PDT 2008
Author: dk
Date: 2008-07-30 12:40:27 -0400 (Wed, 30 Jul 2008)
New Revision: 2735
Modified:
branches/uml-merge/Avida.xcodeproj/project.pbxproj
branches/uml-merge/source/orchid/cMDECompoundExpression.h
branches/uml-merge/source/orchid/cMDEPropertyGenerator.cc
branches/uml-merge/source/orchid/cUMLModel.cc
branches/uml-merge/source/orchid/cUMLModel.h
Log:
starting to fix property generation.
Modified: branches/uml-merge/Avida.xcodeproj/project.pbxproj
===================================================================
--- branches/uml-merge/Avida.xcodeproj/project.pbxproj 2008-07-29 20:20:12 UTC (rev 2734)
+++ branches/uml-merge/Avida.xcodeproj/project.pbxproj 2008-07-30 16:40:27 UTC (rev 2735)
@@ -1951,6 +1951,7 @@
DCC30C4D0762532C008F7A48 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 702442D70859E0B00059BD9B /* Build configuration list for PBXProject "Avida" */;
+ compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 0;
mainGroup = DCC30C490762532C008F7A48;
productRefGroup = DCC3164E07626CF3008F7A48 /* Products */;
Modified: branches/uml-merge/source/orchid/cMDECompoundExpression.h
===================================================================
--- branches/uml-merge/source/orchid/cMDECompoundExpression.h 2008-07-29 20:20:12 UTC (rev 2734)
+++ branches/uml-merge/source/orchid/cMDECompoundExpression.h 2008-07-30 16:40:27 UTC (rev 2735)
@@ -36,10 +36,12 @@
return (s); }
std::string GetInPromela() {
- std::string s;
- s = "(" + _exp_1->GetInPromela() + " " + _exp_op + " ";
- s = s + _exp_2->GetInPromela() + ")";
- return (s);}
+ return "foo";
+// std::string s;
+// s = "(" + _exp_1->GetInPromela() + " " + _exp_op + " ";
+// s = s + _exp_2->GetInPromela() + ")";
+// return (s);
+ }
std::string GetOp() { return _exp_op; }
cMDEExpression* GetLeft() { return _exp_1; }
Modified: branches/uml-merge/source/orchid/cMDEPropertyGenerator.cc
===================================================================
--- branches/uml-merge/source/orchid/cMDEPropertyGenerator.cc 2008-07-29 20:20:12 UTC (rev 2734)
+++ branches/uml-merge/source/orchid/cMDEPropertyGenerator.cc 2008-07-30 16:40:27 UTC (rev 2735)
@@ -574,7 +574,10 @@
cMDECompoundExpression* e = new cMDECompoundExpression(e1, e2, op);
// If ats/ops Are dependent, then don't create the expression
- if (AreExpressionsAtsOpsDependent(e1, e2)) return false;
+ if (AreExpressionsAtsOpsDependent(e1, e2)) {
+ delete e;
+ return false;
+ }
// determine if it uses related classes
e->SetUsesRelatedClasses(AreExpressionsRelated(e1, e2));
Modified: branches/uml-merge/source/orchid/cUMLModel.cc
===================================================================
--- branches/uml-merge/source/orchid/cUMLModel.cc 2008-07-29 20:20:12 UTC (rev 2734)
+++ branches/uml-merge/source/orchid/cUMLModel.cc 2008-07-30 16:40:27 UTC (rev 2735)
@@ -27,7 +27,6 @@
cUMLModel::cUMLModel()
: percent_scenario_complete(0)
-, gen(0)
{
//(const char* seed_model) {
// if(!_cfgLoaded) {
@@ -43,7 +42,7 @@
// genMode = _cfg_gen_mode;
// relatedClassMode = _cfg_related_class_mode;
// gen = new cMDEPropertyGenerator(_cfg_gen);
-// gen->SetRelatedClassMode(_cfg_related_class_mode);
+// gen.SetRelatedClassMode(_cfg_related_class_mode);
// percent_scenario_complete = 0;
// Initialize the property generator.
@@ -54,7 +53,6 @@
cUMLModel::~cUMLModel()
{
- delete gen;
}
cUMLClass* cUMLModel::GetUMLClass(int class_num)
@@ -483,22 +481,22 @@
// Can't be less than the first value.
if (k==0) {
- gen->AddSimpleAttValExpression(a1, temp2, "==", c.GetAssociatedClasses());
- gen->AddSimpleAttValExpression(a1, temp2, "!=", c.GetAssociatedClasses());
- gen->AddSimpleAttValExpression(a1, temp2, ">", c.GetAssociatedClasses());
-// gen->AddSimpleAttValExpression(a1, temp2, ">=", c.GetAssociatedClasses());
+ gen.AddSimpleAttValExpression(a1, temp2, "==", c.GetAssociatedClasses());
+ gen.AddSimpleAttValExpression(a1, temp2, "!=", c.GetAssociatedClasses());
+ gen.AddSimpleAttValExpression(a1, temp2, ">", c.GetAssociatedClasses());
+// gen.AddSimpleAttValExpression(a1, temp2, ">=", c.GetAssociatedClasses());
} else if (k==(a.attribute_values.size() -1)) {
- gen->AddSimpleAttValExpression(a1, temp2, "==", c.GetAssociatedClasses());
- gen->AddSimpleAttValExpression(a1, temp2, "!=", c.GetAssociatedClasses());
-// gen->AddSimpleAttValExpression(a1, temp2, "<=", c.GetAssociatedClasses());
- gen->AddSimpleAttValExpression(a1, temp2, "<", c.GetAssociatedClasses());
+ gen.AddSimpleAttValExpression(a1, temp2, "==", c.GetAssociatedClasses());
+ gen.AddSimpleAttValExpression(a1, temp2, "!=", c.GetAssociatedClasses());
+// gen.AddSimpleAttValExpression(a1, temp2, "<=", c.GetAssociatedClasses());
+ gen.AddSimpleAttValExpression(a1, temp2, "<", c.GetAssociatedClasses());
} else {
- gen->AddSimpleAttValExpression(a1, temp2, "==", c.GetAssociatedClasses());
- gen->AddSimpleAttValExpression(a1, temp2, "!=", c.GetAssociatedClasses());
-// gen->AddSimpleAttValExpression(a1, temp2, "<=", c.GetAssociatedClasses());
- gen->AddSimpleAttValExpression(a1, temp2, "<", c.GetAssociatedClasses());
- gen->AddSimpleAttValExpression(a1, temp2, ">", c.GetAssociatedClasses());
-// gen->AddSimpleAttValExpression(a1, temp2, ">=", c.GetAssociatedClasses());
+ gen.AddSimpleAttValExpression(a1, temp2, "==", c.GetAssociatedClasses());
+ gen.AddSimpleAttValExpression(a1, temp2, "!=", c.GetAssociatedClasses());
+// gen.AddSimpleAttValExpression(a1, temp2, "<=", c.GetAssociatedClasses());
+ gen.AddSimpleAttValExpression(a1, temp2, "<", c.GetAssociatedClasses());
+ gen.AddSimpleAttValExpression(a1, temp2, ">", c.GetAssociatedClasses());
+// gen.AddSimpleAttValExpression(a1, temp2, ">=", c.GetAssociatedClasses());
}
}
@@ -506,8 +504,8 @@
for (unsigned int k=0; k<a.attribute_values.size(); k++){
// Create both an equality and an inequality expression
temp2 = a.attribute_values[k];
- gen->AddSimpleAttValExpression(a1, temp2, "==", c.GetAssociatedClasses());
-// gen->AddSimpleAttValExpression(a1, temp2, "!=", c.GetAssociatedClasses());
+ gen.AddSimpleAttValExpression(a1, temp2, "==", c.GetAssociatedClasses());
+// gen.AddSimpleAttValExpression(a1, temp2, "!=", c.GetAssociatedClasses());
}
}
@@ -517,7 +515,7 @@
temp_size = c.NumOperations();
for (int m=0; m<temp_size; m++) {
o = c.GetOperation(m);
- gen->AddSimpleOperationExpression(o.op_name, class_name, c.GetAssociatedClasses());
+ gen.AddSimpleOperationExpression(o.op_name, class_name, c.GetAssociatedClasses());
}
}
}
Modified: branches/uml-merge/source/orchid/cUMLModel.h
===================================================================
--- branches/uml-merge/source/orchid/cUMLModel.h 2008-07-29 20:20:12 UTC (rev 2734)
+++ branches/uml-merge/source/orchid/cUMLModel.h 2008-07-30 16:40:27 UTC (rev 2735)
@@ -78,7 +78,7 @@
int NumSDs();
int NumSCs();
int NumClasses() { return classes.size(); }
- cMDEPropertyGenerator* GetPropertyGenerator() { return gen; }
+ cMDEPropertyGenerator* GetPropertyGenerator() { return &gen; }
void CreateExpressionsFromClasses();
@@ -131,7 +131,7 @@
void SetGenMode (int gm) { genMode = gm; }
void SetWitnessMode (bool wm) { witnessMode = wm; }
void SetHydraMode (int hm) { hydraMode = hm; }
- void SetRelatedClassMode (int rcm) { gen->SetRelatedClassMode(rcm); }
+ void SetRelatedClassMode (int rcm) { gen.SetRelatedClassMode(rcm); }
protected:
std::string xml;
@@ -147,7 +147,7 @@
int genMode; // 0 = Print, 1 = contribute to interest + Print, 2 = forbid unrelated + Print.
// int relatedClassMode;
double percent_scenario_complete;
- cMDEPropertyGenerator* gen;
+ cMDEPropertyGenerator gen;
};
More information about the Avida-cvs
mailing list