Skip to content

Commit de977f7

Browse files
KalashnikovniKalashnikovni
committed
Debugged SBG operations
1 parent 596c11d commit de977f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+392
-428
lines changed

‎Makefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ $(BUILD_DIR)/%.o : %.cpp
3939
$(CC) $(INCLUDES) $(CXXFLAGS) -MM -MT $@ -MF $(patsubst %.o,%.d,$@) $<
4040
$(CC) $(INCLUDES) -c $< -o $@ $(CXXFLAGS)
4141

42-
$(LIB_SBGRAPH): create-folders $(SBG_OBJ) $(UTIL_OBJ) $(PARSER_OBJ)
43-
$(AR) rcs $(LIB_SBGRAPH) $(SBG_OBJ) $(UTIL_OBJ) $(PARSER_OBJ)
42+
$(LIB_SBGRAPH): create-folders $(SBG_OBJ) $(UTIL_OBJ) $(PARSER_OBJ) $(EVAL_OBJ)
43+
$(AR) rcs $(LIB_SBGRAPH) $(SBG_OBJ) $(UTIL_OBJ) $(PARSER_OBJ) $(EVAL_OBJ)
4444

4545
lib-gtest: | create-folders
4646
ifeq ("$(wildcard $(3RD_PARTY_DIR)/gtest/usr/lib)","")

‎ast/statement.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ ConfigDims::ConfigDims(LIB::NAT nmbr_dims) : nmbr_dims_() {
4242
set_nmbr_dims(nmbr_dims);
4343

4444
else
45-
Debug::ERROR("ConfigDims: dimension should be greater than 0\n");
45+
Util::ERROR("ConfigDims: dimension should be greater than 0\n");
4646
}
4747

4848
member_imp(ConfigDims, LIB::NAT, nmbr_dims);

‎eval/main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void parseEvalProgramFromFile(std::string fname, bool debug)
3535
{
3636
std::ifstream in(fname.c_str());
3737
if (in.fail())
38-
SBG::Debug::ERROR("Unable to open file ", fname, "\n");
38+
SBG::Util::ERROR("Unable to open file ", fname, "\n");
3939
in.unsetf(std::ios::skipws);
4040

4141
std::string str(
@@ -243,7 +243,7 @@ int main(int argc, char**argv)
243243
if (!filename.empty())
244244
parseEvalProgramFromFile(filename, debug);
245245
else
246-
SBG::Debug::ERROR("A filename should be provided\n");
246+
SBG::Util::ERROR("A filename should be provided\n");
247247

248248
return 0;
249249
}

‎eval/visitors/check_opt_conds.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ bool OptConds::operator()(AST::InterBinOp v) const
8383
return l && r;
8484

8585
default:
86-
Debug::ERROR("OptConds: InterBinOp ", v.op(), " unsupported\n");
86+
Util::ERROR("OptConds: InterBinOp ", v.op(), " unsupported\n");
8787
return false;
8888
}
8989
}
@@ -112,7 +112,7 @@ bool OptConds::operator()(AST::MDInterBinOp v) const
112112
return l && r;
113113

114114
default:
115-
Debug::ERROR("OptConds: MDInterBinOp ", v.op(), " unsupported\n");
115+
Util::ERROR("OptConds: MDInterBinOp ", v.op(), " unsupported\n");
116116
return false;
117117
}
118118
}
@@ -144,7 +144,7 @@ bool OptConds::operator()(AST::SetBinOp v) const
144144
return l && r;
145145

146146
default:
147-
Debug::ERROR("EvalUnordSet: SetBinOp ", v.op(), " unsupported\n");
147+
Util::ERROR("EvalUnordSet: SetBinOp ", v.op(), " unsupported\n");
148148
return false;
149149
}
150150
}

‎eval/visitors/eval_dsbg.cpp

+22-22
Original file line numberDiff line numberDiff line change
@@ -28,133 +28,133 @@ EvalDSBG::EvalDSBG(unsigned int nmbr_dims, const LIB::PWMapAF &fact, VarEnv &env
2828

2929
LIB::DSBG EvalDSBG::operator()(AST::Natural v) const
3030
{
31-
Debug::ERROR("EvalDSBG: trying to evaluate Natural ", v, "\n");
31+
Util::ERROR("EvalDSBG: trying to evaluate Natural ", v, "\n");
3232
return LIB::DSBG(fact_);
3333
}
3434

3535
LIB::DSBG EvalDSBG::operator()(AST::Rational v) const
3636
{
37-
Debug::ERROR("EvalDSBG: trying to evaluate Rational ", v, "\n");
37+
Util::ERROR("EvalDSBG: trying to evaluate Rational ", v, "\n");
3838
return LIB::DSBG(fact_);
3939
}
4040

4141
LIB::DSBG EvalDSBG::operator()(AST::VariableName v) const
4242
{
43-
Debug::ERROR("EvalDSBG: variable ", v, " is not a Map\n");
43+
Util::ERROR("EvalDSBG: variable ", v, " is not a Map\n");
4444
return LIB::DSBG(fact_);
4545
}
4646

4747
LIB::DSBG EvalDSBG::operator()(AST::UnaryOp v) const
4848
{
49-
Debug::ERROR("EvalDSBG: trying to evaluate arithmetic UnaryOp ", v, "\n");
49+
Util::ERROR("EvalDSBG: trying to evaluate arithmetic UnaryOp ", v, "\n");
5050
return LIB::DSBG(fact_);
5151
}
5252

5353
LIB::DSBG EvalDSBG::operator()(AST::BinOp v) const
5454
{
55-
Debug::ERROR("EvalDSBG: trying to evaluate arithmetic BinOp ", v, "\n");
55+
Util::ERROR("EvalDSBG: trying to evaluate arithmetic BinOp ", v, "\n");
5656
return LIB::DSBG(fact_);
5757
}
5858

5959
LIB::DSBG EvalDSBG::operator()(AST::Call v) const
6060
{
61-
Debug::ERROR("EvalDSBG: trying to evaluate Call ", v, "\n");
61+
Util::ERROR("EvalDSBG: trying to evaluate Call ", v, "\n");
6262
return LIB::DSBG(fact_);
6363
}
6464

6565
LIB::DSBG EvalDSBG::operator()(AST::Interval v) const
6666
{
67-
Debug::ERROR("EvalDSBG: trying to evaluate Interval ", v, "\n");
67+
Util::ERROR("EvalDSBG: trying to evaluate Interval ", v, "\n");
6868
return LIB::DSBG(fact_);
6969
}
7070

7171
LIB::DSBG EvalDSBG::operator()(AST::InterUnaryOp v) const
7272
{
73-
Debug::ERROR("EvalDSBG: trying to evaluate InterUnaryOp ", v, "\n");
73+
Util::ERROR("EvalDSBG: trying to evaluate InterUnaryOp ", v, "\n");
7474
return LIB::DSBG(fact_);
7575
}
7676

7777
LIB::DSBG EvalDSBG::operator()(AST::InterBinOp v) const
7878
{
79-
Debug::ERROR("EvalDSBG: trying to evaluate InterBinOp ", v, "\n");
79+
Util::ERROR("EvalDSBG: trying to evaluate InterBinOp ", v, "\n");
8080
return LIB::DSBG(fact_);
8181
}
8282

8383
LIB::DSBG EvalDSBG::operator()(AST::MultiDimInter v) const
8484
{
85-
Debug::ERROR("EvalDSBG: trying to evaluate MultiDimInter ", v, "\n");
85+
Util::ERROR("EvalDSBG: trying to evaluate MultiDimInter ", v, "\n");
8686
return LIB::DSBG(fact_);
8787
}
8888

8989
LIB::DSBG EvalDSBG::operator()(AST::MDInterUnaryOp v) const
9090
{
91-
Debug::ERROR("EvalDSBG: trying to evaluate MDInterUnaryOp ", v, "\n");
91+
Util::ERROR("EvalDSBG: trying to evaluate MDInterUnaryOp ", v, "\n");
9292
return LIB::DSBG(fact_);
9393
}
9494

9595
LIB::DSBG EvalDSBG::operator()(AST::MDInterBinOp v) const
9696
{
97-
Debug::ERROR("EvalDSBG: trying to evaluate MDInterBinOp ", v, "\n");
97+
Util::ERROR("EvalDSBG: trying to evaluate MDInterBinOp ", v, "\n");
9898
return LIB::DSBG(fact_);
9999
}
100100

101101
LIB::DSBG EvalDSBG::operator()(AST::Set v) const
102102
{
103-
Debug::ERROR("EvalDSBG: trying to evaluate Set ", v, "\n");
103+
Util::ERROR("EvalDSBG: trying to evaluate Set ", v, "\n");
104104
return LIB::DSBG(fact_);
105105
}
106106

107107
LIB::DSBG EvalDSBG::operator()(AST::SetUnaryOp v) const
108108
{
109-
Debug::ERROR("EvalDSBG: trying to evaluate SetUnaryOp ", v, "\n");
109+
Util::ERROR("EvalDSBG: trying to evaluate SetUnaryOp ", v, "\n");
110110
return LIB::DSBG(fact_);
111111
}
112112

113113
LIB::DSBG EvalDSBG::operator()(AST::SetBinOp v) const
114114
{
115-
Debug::ERROR("EvalDSBG: trying to evaluate SetBinOp ", v, "\n");
115+
Util::ERROR("EvalDSBG: trying to evaluate SetBinOp ", v, "\n");
116116
return LIB::DSBG(fact_);
117117
}
118118

119119
LIB::DSBG EvalDSBG::operator()(AST::LinearExp v) const
120120
{
121-
Debug::ERROR("EvalDSBG: trying to evaluate LinearExp ", v, "\n");
121+
Util::ERROR("EvalDSBG: trying to evaluate LinearExp ", v, "\n");
122122
return LIB::DSBG(fact_);
123123
}
124124

125125
LIB::DSBG EvalDSBG::operator()(AST::LExpBinOp v) const
126126
{
127-
Debug::ERROR("EvalDSBG: trying to evaluate LExpBinOp ", v, "\n");
127+
Util::ERROR("EvalDSBG: trying to evaluate LExpBinOp ", v, "\n");
128128
return LIB::DSBG(fact_);
129129
}
130130

131131
LIB::DSBG EvalDSBG::operator()(AST::MDLExp v) const
132132
{
133-
Debug::ERROR("EvalDSBG: trying to evaluate MDLExp ", v, "\n");
133+
Util::ERROR("EvalDSBG: trying to evaluate MDLExp ", v, "\n");
134134
return LIB::DSBG(fact_);
135135
}
136136

137137
LIB::DSBG EvalDSBG::operator()(AST::MDLExpBinOp v) const
138138
{
139-
Debug::ERROR("EvalDSBG: trying to evaluate MDLExpBinOp ", v, "\n");
139+
Util::ERROR("EvalDSBG: trying to evaluate MDLExpBinOp ", v, "\n");
140140
return LIB::DSBG(fact_);
141141
}
142142

143143
LIB::DSBG EvalDSBG::operator()(AST::LinearMap v) const
144144
{
145-
Debug::ERROR("EvalDSBG: trying to evaluate LinearMap ", v, "\n");
145+
Util::ERROR("EvalDSBG: trying to evaluate LinearMap ", v, "\n");
146146
return LIB::DSBG(fact_);
147147
}
148148

149149
LIB::DSBG EvalDSBG::operator()(AST::PWLMap v) const
150150
{
151-
Debug::ERROR("EvalDSBG: trying to evaluate PWLMap ", v, "\n");
151+
Util::ERROR("EvalDSBG: trying to evaluate PWLMap ", v, "\n");
152152
return LIB::DSBG(fact_);
153153
}
154154

155155
LIB::DSBG EvalDSBG::operator()(AST::SBG v) const
156156
{
157-
Debug::ERROR("EvalDSBG: trying to evaluate SBG ", v, "\n");
157+
Util::ERROR("EvalDSBG: trying to evaluate SBG ", v, "\n");
158158
return LIB::DSBG(fact_);
159159
}
160160

0 commit comments

Comments
 (0)