luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved OASIS-to-OASIS file size by re-introducing sorting of repetition arrays

This commit is contained in:
Matthias Koefferlein 2024-05-25 14:24:00 +02:00
parent e4267e53da
commit 3ca99907de
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/plugins/streamers/oasis/db_plugin/dbOASISWriter.cc
View File

@ -47,6 +47,36 @@ static const char *s_bounding_box_name = "S_BOUNDING_BOX";
// --------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------
/**
* @brief Compare operator for points, distinct x clustered (with same y)
*/
struct vector_cmp_x
{
bool operator() (const db::Vector &a, const db::Vector &b) const
{
if (a.y () != b.y ()) {
return a.y () < b.y ();
} else {
return a.x () < b.x ();
}
}
};
/**
* @brief Compare operator for points, distinct y clustered (with same x)
*/
struct vector_cmp_y
{
bool operator() (const db::Vector &a, const db::Vector &b) const
{
if (a.x () != b.x ()) {
return a.x () < b.x ();
} else {
return a.y () < b.y ();
}
}
};
/** /**
* @brief Determines whether a property shall be produced as S_GDS_PROPERTY * @brief Determines whether a property shall be produced as S_GDS_PROPERTY
*/ */
@ -224,6 +254,7 @@ template <class Tag> void create_repetition_by_type (const db::Shape &array_shap
*pw++ = *p - po; *pw++ = *p - po;
} }
pts.erase (pw, pts.end ()); pts.erase (pw, pts.end ());
std::sort (pts.begin (), pts.end (), vector_cmp_x ());
db::IrregularRepetition *rep_base = new db::IrregularRepetition (); db::IrregularRepetition *rep_base = new db::IrregularRepetition ();
rep_base->points ().swap (pts); rep_base->points ().swap (pts);
@ -269,36 +300,6 @@ void create_repetition (const db::Shape &array, db::Repetition &rep)
} }
} }
/**
* @brief Compare operator for points, distinct x clustered (with same y)
*/
struct vector_cmp_x
{
bool operator() (const db::Vector &a, const db::Vector &b) const
{
if (a.y () != b.y ()) {
return a.y () < b.y ();
} else {
return a.x () < b.x ();
}
}
};
/**
* @brief Compare operator for points, distinct y clustered (with same x)
*/
struct vector_cmp_y
{
bool operator() (const db::Vector &a, const db::Vector &b) const
{
if (a.x () != b.x ()) {
return a.x () < b.x ();
} else {
return a.y () < b.y ();
}
}
};
/** /**
* @brief Compare operator for points/abstract repetition pair with configurable point compare operator * @brief Compare operator for points/abstract repetition pair with configurable point compare operator
*/ */
@ -2030,6 +2031,7 @@ OASISWriter::write (const db::CellInstArray &inst, db::properties_id_type prop_i
*pw++ = *p - po; *pw++ = *p - po;
} }
pts.erase (pw, pts.end ()); pts.erase (pw, pts.end ());
std::sort (pts.begin (), pts.end (), vector_cmp_x ());
db::IrregularRepetition *rep_base = new db::IrregularRepetition (); db::IrregularRepetition *rep_base = new db::IrregularRepetition ();
rep_base->points ().swap (pts); rep_base->points ().swap (pts);