Changeset 1613
- Timestamp:
- Oct 18, 2010 10:55:32 AM (10 years ago)
- Location:
- trunk/Clp/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/src/ClpNode.cpp
r1525 r1613 1160 1160 } 1161 1161 1162 int 1163 ClpHashValue::hash ( double value) const 1164 { 1165 static int mmult[] = { 1162 namespace { 1163 /* 1164 Originally a local static variable in ClpHashValue::hash. 1165 Local static variables are a problem when building DLLs on Windows, but 1166 file-local constants seem to be ok. -- lh, 101016 -- 1167 */ 1168 const int mmult_for_hash[] = { 1166 1169 262139, 259459, 256889, 254291, 251701, 249133, 246709, 244247, 1167 1170 241667, 239179, 236609, 233983, 231289, 228859, 226357, 223829, … … 1175 1178 82183, 79939, 77587, 75307, 72959, 70793, 68447, 66103 1176 1179 }; 1180 } 1181 int 1182 ClpHashValue::hash ( double value) const 1183 { 1184 1177 1185 union { 1178 1186 double d; … … 1186 1194 for ( j = 0; j < 8; ++j ) { 1187 1195 int ichar = v1.c[j]; 1188 n += mmult [j] * ichar;1196 n += mmult_for_hash[j] * ichar; 1189 1197 } 1190 1198 return ( abs ( n ) % maxHash_ ); /* integer abs */ -
trunk/Clp/src/ClpSimplex.cpp
r1586 r1613 1695 1695 //} 1696 1696 //} 1697 # ifndef _MSC_VER 1698 // The local static var k is a problem when trying to build a DLL. Since this is 1699 // just for debugging (likely done on *nix), just hide it from Windows 1700 // -- lh, 101016 -- 1697 1701 if (0) { 1698 1702 static int k = 0; … … 1708 1712 k++; 1709 1713 } 1714 # endif 1710 1715 int status = factorization_->factorize(this, solveType, valuesPass); 1711 1716 if (status) {
Note: See TracChangeset
for help on using the changeset viewer.