Changeset 1100


Ignore:
Timestamp:
03/05/21 19:34:20 (5 weeks ago)
Author:
Maciej Komosinski
Message:

Cosmetic / minor fixes

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • cpp/common/loggers/loggers.h

    r1082 r1100  
    100100        string getMessages() const  { return msgs; }
    101101        string getCountSummary() const; ///< return the standard "... error(s), ... warning(s), ... message(s)" text (or empty string if count==0)
    102         void setStoreOptions(int opts) {options=options&(~(StoreFirstMessage|StoreAllMessages))|(opts&(StoreFirstMessage|StoreAllMessages));}
     102        void setStoreOptions(int opts) {options=(options & (~(StoreFirstMessage|StoreAllMessages))) | (opts&(StoreFirstMessage|StoreAllMessages));}
    103103       
    104104        LoggerToMemory(int opts = 0, int minimal_level_to_store = LOG_ERROR) :LoggerBase(opts), minleveltostore(minimal_level_to_store)
  • cpp/frams/model/similarity/simil-measure.cpp

    r1054 r1100  
    1212static ParamEntry simil_measure_paramtab[] = {
    1313        { "Creature: Similarity", 1, 2, "SimilMeasure", "Evaluates morphological dissimilarity. More information:\nhttp://www.framsticks.com/bib/Komosinski-et-al-2001\nhttp://www.framsticks.com/bib/Komosinski-and-Kubiak-2011\nhttp://www.framsticks.com/bib/Komosinski-2016\nhttps://doi.org/10.1007/978-3-030-16692-2_8", },
    14         { "type", 0, 0, "Type of similarity measure", "d 0 2 1 ~Graph greedy (vertex degree order and greedy matching)~Graph optimal (flexible criteria order and optimal matching)~Descriptor distribution (EMD on a histogram of descriptor values)", FIELD(type), "", },
     14        { "simil_type", 0, 0, "Type of similarity measure", "d 0 2 1 ~Graph greedy (vertex degree order and greedy matching)~Graph optimal (flexible criteria order and optimal matching)~Descriptor distribution (EMD on a histogram of descriptor values)", FIELD(type), "", },
    1515        { "evaluateDistance", 0, PARAM_DONTSAVE | PARAM_USERHIDDEN, "Evaluate model dissimilarity", "p f(oGeno,oGeno)", PROCEDURE(p_evaldistance), "Calculates dissimilarity between two models created from Geno objects.", },
    1616        { 0, },
  • experiments/frams/foraminifera/data/scripts/foraminifera.expdef

    r1098 r1100  
    988988
    989989property:
    990 id:print_output
    991 name:Print messages
    992 help:Print messages on evolution progress.
    993 group:Extras
    994 type:d 0 1 0
    995 
    996 property:
    997990id:visualize
    998991name:Show reticulopodia and nutrients
     
    10111004type:f 0 -1 0.01
    10121005group:
    1013 
    1014 property:
    1015 id:logging
    1016 name:Log statistics to file
    1017 type:d 0 1 0
    1018 group:
    1019 
    1020 property:
    1021 id:logPref
    1022 name:Log prefix
    1023 type:s
    10241006
    10251007property:
     
    12811263type:d 0 1 0
    12821264
     1265property:
     1266id:logging
     1267name:Log statistics to file
     1268type:d 0 1 0
     1269group:
     1270
     1271property:
     1272id:logPref
     1273name:Log prefix
     1274type:s
     1275
     1276property:
     1277id:print_evol_progress
     1278name:Print evolution progress
     1279help:Print messages on evolution progress
     1280type:d 0 1 0
     1281
    12831282state:
    12841283id:nutrient
  • experiments/frams/foraminifera/data/scripts/foraminifera.inc

    r1099 r1100  
    5151
    5252                var dict = {"Time": Simulator.stepNumber, "FromIDs": mode->parentsuids, "ID": new_id, "Inherited": inherit, "Operation": oper, "Kind" : mode->gen};
    53                 if (ExpProperties.print_output == 1)
     53                if (ExpProperties.print_evol_progress == 1)
    5454                        Simulator.print("[OFFSPRING] " + String.serialize(dict));
    5555        }
     
    285285function print_repro_info(cr)
    286286{
    287         if (ExpProperties.print_output == 1)
     287        if (ExpProperties.print_evol_progress == 1)
    288288                Simulator.print("Reproduced " + cr.data->lifeparams->gen + " of species " + cr.data->lifeparams->species + " energy: " + cr.energy);
    289289}
  • framspy/frams.py

    r1096 r1100  
    302302                print("*** Could not find or open '%s' from '%s'.\n*** Did you provide proper arguments and is this file readable?\n" % (lib_name, os.getcwd()))
    303303                raise
    304         os.chdir(original_dir) # restore cwd after loading so framsticks see the expected directory
     304        os.chdir(original_dir) # restore current working dir after loading the library so framsticks sees the expected directory
    305305
    306306        c_api.init.argtypes = [ctypes.c_int, ctypes.POINTER(ctypes.c_char_p)]
     
    345345        c_args = (ctypes.c_char_p * len(initargs))(*list(a.encode(ExtValue._encoding) for a in initargs))
    346346        c_api.init(len(initargs), c_args)
    347         os.chdir(original_dir) # restore again, because framsticks change dir to 'data'
     347        os.chdir(original_dir) # restore current working dir again, because framsticks changes dir to 'data'
    348348        Root = ExtValue._rootObject()
    349349        for n in dir(Root):
Note: See TracChangeset for help on using the changeset viewer.