Subversion Repositories public iLand

Rev

Go to most recent revision | Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
932 3603d 12h werner /branches/port_qt5_64bit/src/ worked on multithreading enabling for ABE;
created a class MapGridRULock that should serialize access --- found some minor bugs in the rest of the code, but finally I think that this locking-code is not strictly necessary since the treelists are *not* changed by management (i.e. a remove does not change the physical layout of the treelist and therefore does not invalidate any pointers to it). The unit-based approach for multithreading does reduce the chance of issues; there is a small chance of lost updates when updating the biomass pools of snags (i.e. if two trees (on two units) of the same resource unit die at the same time).		  
/branches/port_qt5_64bit/src/abe/actthinning.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.h
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.h
930 3604d 11h werner /branches/port_qt5_64bit/src/ progressing in ABEland.
worked inter alia on the activity thinning.
the abe-harvest-output is still not added.		  
/branches/port_qt5_64bit/src/abe/abegrid.cpp
/branches/port_qt5_64bit/src/abe/actthinning.cpp
/branches/port_qt5_64bit/src/abe/actthinning.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.h
/branches/port_qt5_64bit/src/abe/fomescript.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/core/seeddispersal.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
929 3605d 08h werner /branches/port_qt5_64bit/src/ working on ABE.
fixing bugs, adding a stand-level output.		  
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/actplanting.cpp
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/fomewrapper.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/output/abestandout.cpp
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
923 3662d 08h werner /branches/port_qt5_64bit/src/ working on ABE:
ActThinning and some minor other stuff		  
/branches/port_qt5_64bit/src/abe/actthinning.cpp
/branches/port_qt5_64bit/src/abe/actthinning.h
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.h
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
922 3668d 08h werner /branches/port_qt5_64bit/src/ new ABE stand level output. Consolidation of scheduler.  
/branches/port_qt5_64bit/src/abe/output/abestandout.cpp
/branches/port_qt5_64bit/src/abe/output/abestandout.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/fmunit.h
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/output/unitout.cpp
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/abe/scheduler.h
/branches/port_qt5_64bit/src/iland/iland.pro
921 3674d 07h werner /branches/port_qt5_64bit/src/ working on ABE scheduler. tricky stuff....  
/branches/port_qt5_64bit/src/abe/agent.cpp
/branches/port_qt5_64bit/src/abe/agent.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/fmunit.h
/branches/port_qt5_64bit/src/abe/output/unitout.cpp
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/abe/scheduler.h
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/core/soil.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
916 3693d 12h werner /branches/port_qt5_64bit/src/ unit-output, testing of scheduler.  
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/fmunit.h
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/output/unitout.cpp
/branches/port_qt5_64bit/src/abe/scheduler.h
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
915 3694d 11h werner /branches/port_qt5_64bit/src/ developing ABE unit level scheduling, start with dev. of ABE - Outputs.  
/branches/port_qt5_64bit/src/abe/output
/branches/port_qt5_64bit/src/abe/output/unitout.cpp
/branches/port_qt5_64bit/src/abe/output/unitout.h
/branches/port_qt5_64bit/src/abe/agent.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/fmunit.h
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.h
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/abe/scheduler.h
/branches/port_qt5_64bit/src/core/management.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
914 3696d 08h werner /branches/port_qt5_64bit/src/ finish of the stand split thing
many other tweaks in ABE land.		  
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/actplanting.cpp
/branches/port_qt5_64bit/src/abe/actsalvage.cpp
/branches/port_qt5_64bit/src/abe/actsalvage.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/fmstp.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.h
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/management.cpp
/branches/port_qt5_64bit/src/core/management.h
/branches/port_qt5_64bit/src/iland/tests.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.h
909 3708d 15h werner /branches/port_qt5_64bit/src/ more renaming: now it is hopefully done.  
/branches/port_qt5_64bit/src/abe/abegrid.cpp
/branches/port_qt5_64bit/src/abe/abegrid.h
/branches/port_qt5_64bit/src/abe/amiegrid.cpp
/branches/port_qt5_64bit/src/abe/amiegrid.h
/branches/port_qt5_64bit/src/abe/abe_global.h
/branches/port_qt5_64bit/src/abe/actgeneral.cpp
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/actplanting.cpp
/branches/port_qt5_64bit/src/abe/actsalvage.cpp
/branches/port_qt5_64bit/src/abe/actscheduled.cpp
/branches/port_qt5_64bit/src/abe/agenttype.cpp
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstp.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/fomescript.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.h
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/model.h
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/tests.cpp
908 3708d 16h werner /branches/port_qt5_64bit/src/ amie_global.h -> abe_global.h  
/branches/port_qt5_64bit/src/abe/abe_global.h
/branches/port_qt5_64bit/src/abe/amie_global.h
/branches/port_qt5_64bit/src/abe/actgeneral.cpp
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/actplanting.cpp
/branches/port_qt5_64bit/src/abe/actsalvage.cpp
/branches/port_qt5_64bit/src/abe/actscheduled.cpp
/branches/port_qt5_64bit/src/abe/agenttype.cpp
/branches/port_qt5_64bit/src/abe/amiegrid.cpp
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstp.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/fomescript.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/abe/thinning.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
907 3708d 16h werner /branches/port_qt5_64bit/src/ amie -> abe transition  
/branches/port_qt5_64bit/src/abe/actgeneral.cpp
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/activity.h
/branches/port_qt5_64bit/src/abe/actplanting.cpp
/branches/port_qt5_64bit/src/abe/actplanting.h
/branches/port_qt5_64bit/src/abe/actsalvage.cpp
/branches/port_qt5_64bit/src/abe/actsalvage.h
/branches/port_qt5_64bit/src/abe/actscheduled.cpp
/branches/port_qt5_64bit/src/abe/agenttype.cpp
/branches/port_qt5_64bit/src/abe/agenttype.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/fmstp.cpp
/branches/port_qt5_64bit/src/abe/fmstp.h
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.h
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/fmunit.h
/branches/port_qt5_64bit/src/abe/fomescript.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.h
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/abe/scheduler.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/model.h
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
905 3708d 16h werner /branches/port_qt5_64bit/src/ working on scheduler and on implementing disturbances.
now again the AMIE/ABE transformation....		  
/branches/port_qt5_64bit/src/amie/actsalvage.cpp
/branches/port_qt5_64bit/src/amie/actsalvage.h
/branches/port_qt5_64bit/src/amie/actgeneral.h
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/activity.h
/branches/port_qt5_64bit/src/amie/actscheduled.h
/branches/port_qt5_64bit/src/amie/agent.cpp
/branches/port_qt5_64bit/src/amie/agent.h
/branches/port_qt5_64bit/src/amie/agenttype.h
/branches/port_qt5_64bit/src/amie/amiegrid.h
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstand.h
/branches/port_qt5_64bit/src/amie/fmstp.cpp
/branches/port_qt5_64bit/src/amie/fmstp.h
/branches/port_qt5_64bit/src/amie/fomescript.h
/branches/port_qt5_64bit/src/amie/fomewrapper.cpp
/branches/port_qt5_64bit/src/amie/fomewrapper.h
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.h
/branches/port_qt5_64bit/src/amie/scheduler.cpp
/branches/port_qt5_64bit/src/amie/scheduler.h
/branches/port_qt5_64bit/src/amie/thinning.cpp
/branches/port_qt5_64bit/src/amie/thinning.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/model.h
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/tests.cpp
904 3709d 07h werner /branches/port_qt5_64bit/src/ ... working on amie...  
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/agenttype.cpp
/branches/port_qt5_64bit/src/amie/agenttype.h
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstand.h
/branches/port_qt5_64bit/src/amie/fmunit.cpp
/branches/port_qt5_64bit/src/amie/fmunit.h
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.h
/branches/port_qt5_64bit/src/amie/scheduler.cpp
/branches/port_qt5_64bit/src/amie/scheduler.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/model.h
/branches/port_qt5_64bit/src/core/standloader.cpp
/branches/port_qt5_64bit/src/core/standloader.h
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/core/tree.h
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
902 3716d 12h werner /branches/port_qt5_64bit/src/ work on AMIE.
introduced new activity: planting.
zillions of other small mods.		  
/branches/port_qt5_64bit/src/amie/actplanting.cpp
/branches/port_qt5_64bit/src/amie/actplanting.h
/branches/port_qt5_64bit/src/amie/actgeneral.cpp
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/actscheduled.cpp
/branches/port_qt5_64bit/src/amie/amie_global.h
/branches/port_qt5_64bit/src/amie/amiegrid.cpp
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstand.h
/branches/port_qt5_64bit/src/amie/fmstp.cpp
/branches/port_qt5_64bit/src/amie/fmtreelist.cpp
/branches/port_qt5_64bit/src/amie/fmunit.cpp
/branches/port_qt5_64bit/src/amie/fomescript.cpp
/branches/port_qt5_64bit/src/amie/fomewrapper.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/amie/scheduler.cpp
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/sapling.cpp
/branches/port_qt5_64bit/src/core/sapling.h
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/output/snapshot.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
901 3718d 21h werner /branches/port_qt5_64bit/src/ repeating activities,
canceling of execution of javascript code in ABE (abort())
some other stuff....		  
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/activity.h
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstp.cpp
/branches/port_qt5_64bit/src/amie/fomescript.cpp
/branches/port_qt5_64bit/src/amie/fomescript.h
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.h
/branches/port_qt5_64bit/src/amie/scheduler.cpp
/branches/port_qt5_64bit/src/apidoc/ABE/abe_context_doc.js
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/sapling.cpp
/branches/port_qt5_64bit/src/core/standloader.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/tools/random.cpp
/branches/port_qt5_64bit/src/tools/random.h
899 3722d 12h werner /branches/port_qt5_64bit/src/ fix for crashes in getting ABE details after reload of the model.  
/branches/port_qt5_64bit/src/apidoc/ABE
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
897 3722d 12h werner /branches/port_qt5_64bit/src/ working on ABE - doing quite some documentation (YUIDOC), and improving, adding, fixing here or there.
progress is slow but steady ;)		  
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/activity.h
/branches/port_qt5_64bit/src/amie/amiegrid.cpp
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstand.h
/branches/port_qt5_64bit/src/amie/fmstp.cpp
/branches/port_qt5_64bit/src/amie/fmstp.h
/branches/port_qt5_64bit/src/amie/fomescript.cpp
/branches/port_qt5_64bit/src/amie/fomescript.h
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
896 3723d 11h werner /branches/port_qt5_64bit/src/ working on ABE  
/branches/port_qt5_64bit/src/apidoc/abe_doc.js
/branches/port_qt5_64bit/src/apidoc/globals_doc.js
/branches/port_qt5_64bit/src/apidoc/treelist_doc.js
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/actscheduled.cpp
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstand.h
/branches/port_qt5_64bit/src/amie/fmunit.cpp
/branches/port_qt5_64bit/src/amie/fmunit.h
/branches/port_qt5_64bit/src/amie/fomescript.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.h
/branches/port_qt5_64bit/src/amie/scheduler.cpp
/branches/port_qt5_64bit/src/apidoc/ABE/abe_doc.js
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/model.h
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.h
/branches/port_qt5_64bit/src/tools/gisgrid.cpp
893 3743d 11h werner /branches/port_qt5_64bit/src/ ABE ABE ABE ...  
/branches/port_qt5_64bit/src/amie/actgeneral.cpp
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/activity.h
/branches/port_qt5_64bit/src/amie/amiegrid.cpp
/branches/port_qt5_64bit/src/amie/amiegrid.h
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstp.cpp
/branches/port_qt5_64bit/src/amie/fomescript.cpp
/branches/port_qt5_64bit/src/amie/fomescript.h
/branches/port_qt5_64bit/src/amie/scheduler.cpp
/branches/port_qt5_64bit/src/core/layeredgrid.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/core/modelcontroller.h
/branches/port_qt5_64bit/src/core/species.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.h

←Prev12Next→

Show All