Changeset 972 for cpp/frams/genetics/genoconv.cpp

Timestamp:

07/03/20 00:32:23 (5 years ago)

Author:

Maciej Komosinski

Message:

• separate "0" and "0s" formats (for SHAPE_BALL_AND_STICK and SHAPE_SOLIDS, respectively)
• converting to format list (Geno::F0_FORMAT_LIST = "0,0s")
• (optional) declaring Model as SHAPE_BALL_AND_STICK or SHAPE_SOLIDS (or SHAPE_UNKNOWN)

File:

• cpp/frams/genetics/genoconv.cpp (modified) (7 diffs)

cpp/frams/genetics/genoconv.cpp

@@ -123 +123 @@
 /// (can be NULL if you don't need this information)
 
-GenoConverter **GenoConvManager::getPath(const SString& in, const SString& out, GenoConverter **path, int maxlen, int *mapavailable)
+GenoConverter **GenoConvManager::getPath(const SString& in_format, const SString& out_format_list, GenoConverter **path, int maxlen, int *mapavailable)
 {
         if (!maxlen) return 0;
@@ -130 +130 @@
         for (; gk = (GenoConverter*)converters(i); i++)
         {
-                if ((gk->enabled) && (gk->in_format == in))
+                if ((gk->enabled) && (gk->in_format == in_format))
                 {
                         *path = gk;
-                        if (gk->out_format == out)
+                        if (Geno::formatIsOneOf(gk->out_format, out_format_list))
                         {
                                 if (mapavailable)
@@ -142 +142 @@
                         {
                                 int mapavail;
-                                GenoConverter **ret = getPath(gk->out_format, out, path + 1, maxlen - 1, &mapavail);
+                                GenoConverter **ret = getPath(gk->out_format, out_format_list, path + 1, maxlen - 1, &mapavail);
                                 if (ret)
                                 {
@@ -155 +155 @@
 }
 
-Geno GenoConvManager::convert(Geno &in, SString format, MultiMap *map, bool using_checkpoints, bool *converter_missing)
-{
-        if (in.getFormat() == format) { if (converter_missing) *converter_missing = false; return in; }
+Geno GenoConvManager::convert(Geno &in, SString format_list, MultiMap *map, bool using_checkpoints, bool *converter_missing)
+{
+        if (Geno::formatIsOneOf(in.getFormat(), format_list))
+        {
+                if (converter_missing) *converter_missing = false; return in;
+        }
         GenoConverter *path[10];
         int dep;
@@ -164 +167 @@
         int mapavail;
         for (dep = 1; dep < (int)sizeof(path); dep++) //iterative deepening
-                if (ret = getPath(in.getFormat(), format, path, dep, &mapavail)) break;
+                if (ret = getPath(in.getFormat(), format_list, path, dep, &mapavail)) break;
         if (!ret) { if (converter_missing) *converter_missing = true; return Geno("", Geno::INVALID_FORMAT, "", "converter not found"); }
         if (converter_missing) *converter_missing = false;
         if (!map) mapavail = 0;
         GenoConverter **t = path;
-        SString tmp;
+        SString tmp, out_format;
         tmp = in.getGenes();
         MultiMap lastmap, tmpmap;
@@ -177 +180 @@
                 GenoConverter *gk = *t;
                 tmp = gk->convert(tmp, mapavail ? &tmpmap : 0, using_checkpoints);
-                if (!tmp.len())
+                out_format = gk->out_format;
+                if (!tmp.length())
                 {
                         string t = ssprintf("f%s->f%s conversion failed (%s)", gk->in_format.c_str(), gk->out_format.c_str(), gk->name);
@@ -200 +204 @@
         if (map)
                 *map = lastmap;
-        return Geno(tmp, format, in.getName(), in.getComment());
-}
+        return Geno(tmp, out_format, in.getName(), in.getComment());
+}