[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [5254] Mark "scalar" strategies as obsolete; remove them w
From: |
Greg Chicares |
Subject: |
[lmi-commits] [5254] Mark "scalar" strategies as obsolete; remove them where warranted |
Date: |
Mon, 15 Aug 2011 01:50:33 +0000 |
Revision: 5254
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5254
Author: chicares
Date: 2011-08-15 01:50:32 +0000 (Mon, 15 Aug 2011)
Log Message:
-----------
Mark "scalar" strategies as obsolete; remove them where warranted
Modified Paths:
--------------
lmi/trunk/ChangeLog
lmi/trunk/datum_sequence.cpp
lmi/trunk/input_realization.cpp
lmi/trunk/mc_enum_types.xpp
Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2011-08-15 01:18:47 UTC (rev 5253)
+++ lmi/trunk/ChangeLog 2011-08-15 01:50:32 UTC (rev 5254)
@@ -28284,3 +28284,23 @@
Display busy cursor while preparing to edit input. See:
http://lists.nongnu.org/archive/html/lmi/2011-08/msg00047.html
+20110815T0049Z <address@hidden> [623]
+
+ input_seq_helpers.cpp
+ input_seq_helpers.hpp
+Remove dead code.
+
+20110815T0118Z <address@hidden> [623]
+
+ input_seq_helpers.hpp
+ mec_input.cpp
+ yare_input.cpp
+Move convert_vector_type().
+
+20110815T0150Z <address@hidden> [623]
+
+ datum_sequence.cpp
+ input_realization.cpp
+ mc_enum_types.xpp
+Mark "scalar" strategies as obsolete; remove them where warranted.
+
Modified: lmi/trunk/datum_sequence.cpp
===================================================================
--- lmi/trunk/datum_sequence.cpp 2011-08-15 01:18:47 UTC (rev 5253)
+++ lmi/trunk/datum_sequence.cpp 2011-08-15 01:50:32 UTC (rev 5254)
@@ -194,10 +194,8 @@
all_keywords["gsp" ] = "PmtGSP" ;
all_keywords["corridor"] = "PmtCorridor" ;
all_keywords["table" ] = "PmtTable" ;
- all_keywords["none" ] = "PmtInputScalar" ;
}
std::map<std::string,std::string> permissible_keywords = all_keywords;
- permissible_keywords.erase("none");
return permissible_keywords;
}
Modified: lmi/trunk/input_realization.cpp
===================================================================
--- lmi/trunk/input_realization.cpp 2011-08-15 01:18:47 UTC (rev 5253)
+++ lmi/trunk/input_realization.cpp 2011-08-15 01:50:32 UTC (rev 5254)
@@ -151,7 +151,6 @@
all_keywords["gsp" ] = "SAGSP" ;
all_keywords["corridor"] = "SACorridor" ;
all_keywords["salary" ] = "SASalary" ;
- all_keywords["none" ] = "SAInputScalar" ;
}
// std::map<std::string,std::string> permissible_keywords = all_keywords;
std::map<std::string,std::string> permissible_keywords;
@@ -161,7 +160,6 @@
{
permissible_keywords.insert(*i);
}
- permissible_keywords.erase("none");
bool specified_amount_indeterminate =
mce_solve_specamt == SolveType
@@ -532,7 +530,7 @@
,SpecifiedAmountStrategyRealized_
,SpecifiedAmount
,permissible_specified_amount_strategy_keywords()
- ,std::string("none")
+ ,std::string("")
);
}
@@ -591,7 +589,7 @@
,PaymentStrategyRealized_
,Payment
,Payment.allowed_keywords()
- ,std::string("none")
+ ,Payment.default_keyword()
);
}
@@ -620,7 +618,7 @@
,CorporationPaymentStrategyRealized_
,CorporationPayment
,CorporationPayment.allowed_keywords()
- ,std::string("none")
+ ,CorporationPayment.default_keyword()
);
}
Modified: lmi/trunk/mc_enum_types.xpp
===================================================================
--- lmi/trunk/mc_enum_types.xpp 2011-08-15 01:18:47 UTC (rev 5253)
+++ lmi/trunk/mc_enum_types.xpp 2011-08-15 01:50:32 UTC (rev 5254)
@@ -241,6 +241,8 @@
,"Avoid MEC" \
};
+// "scalar" is obsolete.
+
#define pmt_strategy_VALUES \
{mce_pmt_input_scalar \
,mce_pmt_minimum \
@@ -262,6 +264,8 @@
,"PmtTable" \
};
+// "scalar" is obsolete.
+
#define sa_strategy_VALUES \
{mce_sa_input_scalar \
,mce_sa_maximum \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [5254] Mark "scalar" strategies as obsolete; remove them where warranted,
Greg Chicares <=