Kevin/tp-modelisation-problemes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Kevin:fbd0a603cc3b7117020ec3abc0e46f4f702dcfdc
Branches Tags
Kevin:main
...
compare: Kevin:e2d1a2da341e3887fbeed8018534ed6a88ae04fb
Branches Tags
Kevin:main

4 Commits
fbd0a603cc ... e2d1a2da34

Author SHA1 Message Date
LJ5O
e2d1a2da34 Fix FactoryGraphManager 2025-10-13 15:29:41 +02:00
LJ5O
3ebf1efe9d Définition de Sink dans le Graph manager 2025-10-13 14:51:30 +02:00
LJ5O
afae863f68 Plusieurs PO peuvent arriver au Sink 2025-10-13 14:24:27 +02:00
LJ5O
494d4dfde4 Fix test simple 2025-10-13 13:47:18 +02:00
23 changed files with 34133 additions and 28943 deletions
Expand all files Collapse all files

4
artis-factory.cbp
View File

@@ -108,6 +108,7 @@
<Option type="1"/> <Option type="1"/>
<Option compiler="gcc"/> <Option compiler="gcc"/>
<Compiler> <Compiler>
<Add option="-DWITH_TRACE"/>
<Add option="-DBOOST_UNIT_TEST_FRAMEWORK_NO_LIB"/> <Add option="-DBOOST_UNIT_TEST_FRAMEWORK_NO_LIB"/>
<Add option="-DBOOST_UNIT_TEST_FRAMEWORK_DYN_LINK"/> <Add option="-DBOOST_UNIT_TEST_FRAMEWORK_DYN_LINK"/>
<Add directory="/home/lj50/Univ/M2/Modelisation_problemes/simulation/src"/> <Add directory="/home/lj50/Univ/M2/Modelisation_problemes/simulation/src"/>
@@ -134,6 +135,7 @@
<Option type="1"/> <Option type="1"/>
<Option compiler="gcc"/> <Option compiler="gcc"/>
<Compiler> <Compiler>
<Add option="-DWITH_TRACE"/>
<Add option="-DBOOST_UNIT_TEST_FRAMEWORK_NO_LIB"/> <Add option="-DBOOST_UNIT_TEST_FRAMEWORK_NO_LIB"/>
<Add option="-DBOOST_UNIT_TEST_FRAMEWORK_DYN_LINK"/> <Add option="-DBOOST_UNIT_TEST_FRAMEWORK_DYN_LINK"/>
<Add directory="/home/lj50/Univ/M2/Modelisation_problemes/simulation/src"/> <Add directory="/home/lj50/Univ/M2/Modelisation_problemes/simulation/src"/>
@@ -160,6 +162,7 @@
<Option type="1"/> <Option type="1"/>
<Option compiler="gcc"/> <Option compiler="gcc"/>
<Compiler> <Compiler>
<Add option="-DWITH_TRACE"/>
<Add option="-DBOOST_UNIT_TEST_FRAMEWORK_NO_LIB"/> <Add option="-DBOOST_UNIT_TEST_FRAMEWORK_NO_LIB"/>
<Add option="-DBOOST_UNIT_TEST_FRAMEWORK_DYN_LINK"/> <Add option="-DBOOST_UNIT_TEST_FRAMEWORK_DYN_LINK"/>
<Add directory="/home/lj50/Univ/M2/Modelisation_problemes/simulation/src"/> <Add directory="/home/lj50/Univ/M2/Modelisation_problemes/simulation/src"/>
@@ -186,6 +189,7 @@
<Option type="1"/> <Option type="1"/>
<Option compiler="gcc"/> <Option compiler="gcc"/>
<Compiler> <Compiler>
<Add option="-DWITH_TRACE"/>
<Add option="-DBOOST_UNIT_TEST_FRAMEWORK_NO_LIB"/> <Add option="-DBOOST_UNIT_TEST_FRAMEWORK_NO_LIB"/>
<Add option="-DBOOST_UNIT_TEST_FRAMEWORK_DYN_LINK"/> <Add option="-DBOOST_UNIT_TEST_FRAMEWORK_DYN_LINK"/>
<Add directory="/home/lj50/Univ/M2/Modelisation_problemes/simulation/src"/> <Add directory="/home/lj50/Univ/M2/Modelisation_problemes/simulation/src"/>

74
artis-factory.layout
View File

@@ -2,44 +2,9 @@
<CodeBlocks_layout_file> <CodeBlocks_layout_file>
<FileVersion major="1" minor="0" /> <FileVersion major="1" minor="0" />
<ActiveTarget name="test_simple" /> <ActiveTarget name="test_simple" />
<File name="src/Router.cpp" open="1" top="1" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="src/Sink.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="0" topLine="0" /> <Cursor1 position="1556" topLine="24" />
</Cursor>
</File>
<File name="src/Processor.hpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="1" zoom_2="0">
<Cursor>
<Cursor1 position="1175" topLine="21" />
</Cursor>
</File>
<File name="src/ProductionOrder.hpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="60" />
</Cursor>
</File>
<File name="src/Machine.hpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="6" />
</Cursor>
</File>
<File name="src/Sink.hpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1138" topLine="12" />
</Cursor>
</File>
<File name="src/ItemStock.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="24" />
</Cursor>
</File>
<File name="src/PoolRouter.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="116" />
</Cursor>
</File>
<File name="src/Sink.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="853" topLine="12" />
</Cursor> </Cursor>
</File> </File>
<File name="src/Processor.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="src/Processor.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@@ -47,4 +12,39 @@
<Cursor1 position="1887" topLine="24" /> <Cursor1 position="1887" topLine="24" />
</Cursor> </Cursor>
</File> </File>
<File name="src/Router.cpp" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
</Cursor>
</File>
<File name="src/ProductionOrder.hpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="60" />
</Cursor>
</File>
<File name="src/Processor.hpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="1" zoom_2="0">
<Cursor>
<Cursor1 position="1175" topLine="87" />
</Cursor>
</File>
<File name="src/Machine.hpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="6" />
</Cursor>
</File>
<File name="src/ItemStock.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="24" />
</Cursor>
</File>
<File name="src/Sink.hpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1138" topLine="12" />
</Cursor>
</File>
<File name="src/PoolRouter.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="116" />
</Cursor>
</File>
</CodeBlocks_layout_file> </CodeBlocks_layout_file>

57602
build/test/PoolRouter.csv
View File

File diff suppressed because it is too large Load Diff

BIN
src/CMakeFiles/factory_core.dir/PoolRouter.cpp.o
View File

Binary file not shown.

4
src/CMakeFiles/factory_core.dir/PoolRouter.cpp.o.d
View File

@@ -1007,4 +1007,6 @@ src/CMakeFiles/factory_core.dir/PoolRouter.cpp.o: \
/usr/local/include/artis-star-1.0/artis-star/kernel/pdevs/Context.hpp \ /usr/local/include/artis-star-1.0/artis-star/kernel/pdevs/Context.hpp \
/usr/include/c++/13/cxxabi.h \ /usr/include/c++/13/cxxabi.h \
/usr/include/x86_64-linux-gnu/c++/13/bits/cxxabi_tweaks.h \ /usr/include/x86_64-linux-gnu/c++/13/bits/cxxabi_tweaks.h \
/home/lj50/Univ/M2/Modelisation_problemes/simulation/src/ProductionOrder.hpp /home/lj50/Univ/M2/Modelisation_problemes/simulation/src/ProductionOrder.hpp \
/home/lj50/Univ/M2/Modelisation_problemes/simulation/src/Sink.hpp \
/home/lj50/Univ/M2/Modelisation_problemes/simulation/src/Machine.hpp

BIN
src/CMakeFiles/factory_core.dir/Sink.cpp.o
View File

Binary file not shown.

2
src/CMakeFiles/factory_core.dir/compiler_depend.internal
View File

@@ -3320,8 +3320,10 @@ src/CMakeFiles/factory_core.dir/Machine.cpp.o
src/CMakeFiles/factory_core.dir/PoolRouter.cpp.o src/CMakeFiles/factory_core.dir/PoolRouter.cpp.o
/home/lj50/Univ/M2/Modelisation_problemes/simulation/src/PoolRouter.cpp /home/lj50/Univ/M2/Modelisation_problemes/simulation/src/PoolRouter.cpp
/home/lj50/Univ/M2/Modelisation_problemes/simulation/src/Base.hpp /home/lj50/Univ/M2/Modelisation_problemes/simulation/src/Base.hpp
/home/lj50/Univ/M2/Modelisation_problemes/simulation/src/Machine.hpp
/home/lj50/Univ/M2/Modelisation_problemes/simulation/src/PoolRouter.hpp /home/lj50/Univ/M2/Modelisation_problemes/simulation/src/PoolRouter.hpp
/home/lj50/Univ/M2/Modelisation_problemes/simulation/src/ProductionOrder.hpp /home/lj50/Univ/M2/Modelisation_problemes/simulation/src/ProductionOrder.hpp
/home/lj50/Univ/M2/Modelisation_problemes/simulation/src/Sink.hpp
/usr/include/alloca.h /usr/include/alloca.h
/usr/include/asm-generic/errno-base.h /usr/include/asm-generic/errno-base.h
/usr/include/asm-generic/errno.h /usr/include/asm-generic/errno.h

6
src/CMakeFiles/factory_core.dir/compiler_depend.make
View File

@@ -3316,8 +3316,10 @@ src/CMakeFiles/factory_core.dir/Machine.cpp.o: src/Machine.cpp \
src/CMakeFiles/factory_core.dir/PoolRouter.cpp.o: src/PoolRouter.cpp \ src/CMakeFiles/factory_core.dir/PoolRouter.cpp.o: src/PoolRouter.cpp \
src/Base.hpp \ src/Base.hpp \
src/Machine.hpp \
src/PoolRouter.hpp \ src/PoolRouter.hpp \
src/ProductionOrder.hpp \ src/ProductionOrder.hpp \
src/Sink.hpp \
/usr/include/alloca.h \ /usr/include/alloca.h \
/usr/include/asm-generic/errno-base.h \ /usr/include/asm-generic/errno-base.h \
/usr/include/asm-generic/errno.h \ /usr/include/asm-generic/errno.h \
@@ -11276,8 +11278,6 @@ src/Stock.hpp:
src/Stock.cpp: src/Stock.cpp:
src/Sink.hpp:
src/Separator.cpp: src/Separator.cpp:
src/Router.hpp: src/Router.hpp:
@@ -11298,6 +11298,8 @@ src/ProductionOrder.cpp:
src/Processor.hpp: src/Processor.hpp:
src/Sink.hpp:
/usr/include/c++/13/bits/locale_facets.tcc: /usr/include/c++/13/bits/locale_facets.tcc:
/usr/include/boost/preprocessor/repetition/limits/repeat_256.hpp: /usr/include/boost/preprocessor/repetition/limits/repeat_256.hpp:

1
src/CMakeLists.txt
View File

@@ -17,3 +17,4 @@ SET(FACTORY_CORE_CPP Base.cpp Combiner.hpp Conveyor.hpp ItemStock.cpp Machine.cp
ADD_LIBRARY(factory_core ${FACTORY_CORE_HPP} ${FACTORY_CORE_CPP}) ADD_LIBRARY(factory_core ${FACTORY_CORE_HPP} ${FACTORY_CORE_CPP})
TARGET_LINK_LIBRARIES(factory_core ${Boost_LIBRARIES} ${ARTIS_LIBRARIES}) TARGET_LINK_LIBRARIES(factory_core ${Boost_LIBRARIES} ${ARTIS_LIBRARIES})

19
src/FactoryGraphManager.hpp
View File

@@ -31,6 +31,7 @@
#include "JsonReader.hpp" #include "JsonReader.hpp"
#include "PoolRouter.hpp" #include "PoolRouter.hpp"
#include "Router.hpp" #include "Router.hpp"
#include "Sink.hpp"
#include <artis-star/kernel/pdevs/GraphManager.hpp> #include <artis-star/kernel/pdevs/GraphManager.hpp>
@@ -105,8 +106,20 @@ public:
break; break;
} }
case SINK: { case SINK: {
// TODO auto new_sink = new SinkSimulator(
break; "M_" + std::to_string(m->pool_id) + "_" + std::to_string(m->machine_id),
SinkParameters{}
);
_sinks.push_back(new_sink);
this->add_child(MACHINE + machine_index, new_sink);
// PoolRouter -> Sink
out({_pool_routers.back(), artis::factory::PoolRouter::outputs::OUT_M + m->machine_id})
>> in({_sinks.back(), artis::factory::Sink::inputs::IN});
++machine_index;
break;
} }
case SEPARATOR: { case SEPARATOR: {
// TODO // TODO
@@ -133,11 +146,13 @@ private:
typedef artis::pdevs::Simulator<artis::common::DoubleTime, artis::factory::Router, artis::factory::RouterParameters> RouterSimulator; typedef artis::pdevs::Simulator<artis::common::DoubleTime, artis::factory::Router, artis::factory::RouterParameters> RouterSimulator;
typedef artis::pdevs::Simulator<artis::common::DoubleTime, artis::factory::PoolRouter, artis::factory::PoolRouterParameters> PoolRouterSimulator; typedef artis::pdevs::Simulator<artis::common::DoubleTime, artis::factory::PoolRouter, artis::factory::PoolRouterParameters> PoolRouterSimulator;
typedef artis::pdevs::Simulator<artis::common::DoubleTime, artis::factory::Processor, artis::factory::ProcessorParameters> ProcessorSimulator; typedef artis::pdevs::Simulator<artis::common::DoubleTime, artis::factory::Processor, artis::factory::ProcessorParameters> ProcessorSimulator;
typedef artis::pdevs::Simulator<artis::common::DoubleTime, artis::factory::Sink, artis::factory::SinkParameters> SinkSimulator;
GeneratorSimulator *_generator; GeneratorSimulator *_generator;
RouterSimulator *_router; RouterSimulator *_router;
std::vector<PoolRouterSimulator *> _pool_routers; std::vector<PoolRouterSimulator *> _pool_routers;
std::vector<ProcessorSimulator *> _processors; std::vector<ProcessorSimulator *> _processors;
std::vector<SinkSimulator *> _sinks;
}; };
} }

11
src/PoolRouter.cpp
View File

@@ -25,6 +25,7 @@
*/ */
#include "PoolRouter.hpp" #include "PoolRouter.hpp"
#include "Sink.hpp"
namespace artis::factory { namespace artis::factory {
@@ -47,7 +48,15 @@ void PoolRouter::dint(const Time & /* t */) {
} else if ((*it)->current_operation().get_type() == CHANGE_POOL_TYPE) { } else if ((*it)->current_operation().get_type() == CHANGE_POOL_TYPE) {
_available_machines[(*it)->previous_operation()->get_loc_index()] = true; _available_machines[(*it)->previous_operation()->get_loc_index()] = true;
} else { } else {
_available_machines[(*it)->current_operation().get_loc_index()] = false; //_available_machines[(*it)->current_operation().get_loc_index()] = false;
auto idx = (*it)->current_operation().get_loc_index();
// Modifié pour gérer le Sink
if (idx == _available_machines.size()-1) {// Par simplicité, je considère que la dernière machine connectée est le Sink
_available_machines[idx] = true;// Et si idx est le dernier index, alors cette "machine" reste disponible
} else {
_available_machines[idx] = false;
}
} }
_pending_po.erase(it); _pending_po.erase(it);
if (std::find_if(_pending_po.cbegin(), _pending_po.cend(), [this](const auto &e) { if (std::find_if(_pending_po.cbegin(), _pending_po.cend(), [this](const auto &e) {

6
src/Sink.cpp
View File

@@ -26,7 +26,7 @@
#include "Sink.hpp" #include "Sink.hpp"
namespace artis::factory { // TODO : Peut être qu'il manque du code dans cette classe. Pour le moment, le test tourne à l'infini. Trouver où ça coince et ce qu'il manque namespace artis::factory {
void Sink::dint(const Time &/*t*/) { void Sink::dint(const Time &/*t*/) {
// TODO // TODO
@@ -59,6 +59,10 @@ void Sink::dext(const Time &t, const Time & /* e */, const Bag &bag) {
void Sink::start(const Time & /* t */) { void Sink::start(const Time & /* t */) {
_phase = Phase::INIT; _phase = Phase::INIT;
// Préparation du modèle, j'imagine que ce n'est pas utile donc passage immédiat en READY
_phase = Phase::READY;
// Le modèle est prêt, on attend des PO
_phase = Phase::WAIT;
} }
Time Sink::ta(const Time & /* t */) const { Time Sink::ta(const Time & /* t */) const {

BIN
src/libfactory_core.a
View File

Binary file not shown.

1290
test/CMakeFiles/test_json.dir/compiler_depend.internal Normal file
View File

File diff suppressed because it is too large Load Diff

3861
test/CMakeFiles/test_json.dir/compiler_depend.make
View File

File diff suppressed because it is too large Load Diff

2
test/CMakeFiles/test_json.dir/flags.make
View File

@@ -2,7 +2,7 @@
# Generated by "Unix Makefiles" Generator, CMake Version 3.28 # Generated by "Unix Makefiles" Generator, CMake Version 3.28
# compile CXX with /usr/bin/c++ # compile CXX with /usr/bin/c++
CXX_DEFINES = -DBOOST_UNIT_TEST_FRAMEWORK_DYN_LINK -DBOOST_UNIT_TEST_FRAMEWORK_NO_LIB CXX_DEFINES = -DBOOST_UNIT_TEST_FRAMEWORK_DYN_LINK -DBOOST_UNIT_TEST_FRAMEWORK_NO_LIB -DWITH_TRACE
CXX_INCLUDES = -I/home/lj50/Univ/M2/Modelisation_problemes/simulation/src -I/usr/local/include/artis-star-1.0 CXX_INCLUDES = -I/home/lj50/Univ/M2/Modelisation_problemes/simulation/src -I/usr/local/include/artis-star-1.0

BIN
test/CMakeFiles/test_json.dir/test_json.cpp.o
View File

Binary file not shown.

2
test/CMakeFiles/test_simple.dir/flags.make
View File

@@ -2,7 +2,7 @@
# Generated by "Unix Makefiles" Generator, CMake Version 3.28 # Generated by "Unix Makefiles" Generator, CMake Version 3.28
# compile CXX with /usr/bin/c++ # compile CXX with /usr/bin/c++
CXX_DEFINES = -DBOOST_UNIT_TEST_FRAMEWORK_DYN_LINK -DBOOST_UNIT_TEST_FRAMEWORK_NO_LIB CXX_DEFINES = -DBOOST_UNIT_TEST_FRAMEWORK_DYN_LINK -DBOOST_UNIT_TEST_FRAMEWORK_NO_LIB -DWITH_TRACE
CXX_INCLUDES = -I/home/lj50/Univ/M2/Modelisation_problemes/simulation/src -I/usr/local/include/artis-star-1.0 CXX_INCLUDES = -I/home/lj50/Univ/M2/Modelisation_problemes/simulation/src -I/usr/local/include/artis-star-1.0

BIN
test/CMakeFiles/test_simple.dir/test_simple.cpp.o
View File

Binary file not shown.

4
test/CMakeLists.txt
View File

@@ -1,3 +1,5 @@
add_definitions(-DWITH_TRACE)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src
${ARTIS_INCLUDE_DIRS} ${ARTIS_INCLUDE_DIRS}
@@ -12,3 +14,5 @@ TARGET_LINK_LIBRARIES(test_simple ${Boost_LIBRARIES} ${ARTIS_LIBRARIES} factory_
ADD_EXECUTABLE(test_json test_json.cpp) ADD_EXECUTABLE(test_json test_json.cpp)
TARGET_LINK_LIBRARIES(test_json ${Boost_LIBRARIES} ${ARTIS_LIBRARIES} factory_core) TARGET_LINK_LIBRARIES(test_json ${Boost_LIBRARIES} ${ARTIS_LIBRARIES} factory_core)

186
test/PoolRouter.csv
View File

@@ -2498,11 +2498,11 @@ time;:root:G:total_po_number;:root:P_R:waiting_po_number
2496;109;0 2496;109;0
2497;109;0 2497;109;0
2498;109;0 2498;109;0
2499;109;0 2499;109;1
2500;110;0 2500;110;1
2501;110;0 2501;110;1
2502;110;0 2502;110;1
2503;110;0 2503;110;1
2504;110;0 2504;110;0
2505;110;0 2505;110;0
2506;110;0 2506;110;0
@@ -2515,11 +2515,11 @@ time;:root:G:total_po_number;:root:P_R:waiting_po_number
2513;110;1 2513;110;1
2514;110;1 2514;110;1
2515;110;1 2515;110;1
2516;110;0 2516;110;1
2517;110;0 2517;110;1
2518;110;0 2518;110;1
2519;110;0 2519;110;1
2520;110;0 2520;110;1
2521;110;0 2521;110;0
2522;110;0 2522;110;0
2523;110;0 2523;110;0
@@ -2800,18 +2800,18 @@ time;:root:G:total_po_number;:root:P_R:waiting_po_number
2798;123;0 2798;123;0
2799;123;0 2799;123;0
2800;123;0 2800;123;0
2801;123;0 2801;123;1
2802;123;0 2802;123;1
2803;123;0 2803;123;1
2804;123;0 2804;123;1
2805;123;0 2805;123;1
2806;123;0 2806;123;1
2807;123;0 2807;123;1
2808;123;0 2808;123;1
2809;123;0 2809;123;1
2810;123;0 2810;123;1
2811;123;0 2811;123;1
2812;123;0 2812;123;1
2813;123;1 2813;123;1
2814;123;0 2814;123;0
2815;123;0 2815;123;0
@@ -22771,23 +22771,23 @@ time;:root:G:total_po_number;:root:P_R:waiting_po_number
22769;1007;0 22769;1007;0
22770;1007;0 22770;1007;0
22771;1007;0 22771;1007;0
22772;1008;0 22772;1008;1
22773;1008;0 22773;1008;1
22774;1008;0 22774;1008;1
22775;1008;0 22775;1008;1
22776;1008;0 22776;1008;1
22777;1008;0 22777;1008;1
22778;1008;0 22778;1008;1
22779;1008;0 22779;1008;1
22780;1008;0 22780;1008;1
22781;1008;0 22781;1008;1
22782;1008;0 22782;1008;1
22783;1008;1 22783;1008;1
22784;1008;1 22784;1008;1
22785;1008;1 22785;1008;1
22786;1008;1 22786;1008;1
22787;1008;1 22787;1008;1
22788;1008;1 22788;1008;0
22789;1008;0 22789;1008;0
22790;1008;0 22790;1008;0
22791;1008;0 22791;1008;0
@@ -22804,7 +22804,7 @@ time;:root:G:total_po_number;:root:P_R:waiting_po_number
22802;1009;1 22802;1009;1
22803;1009;1 22803;1009;1
22804;1009;1 22804;1009;1
22805;1009;1 22805;1009;0
22806;1009;0 22806;1009;0
22807;1009;0 22807;1009;0
22808;1009;0 22808;1009;0
@@ -22816,14 +22816,14 @@ time;:root:G:total_po_number;:root:P_R:waiting_po_number
22814;1009;0 22814;1009;0
22815;1010;0 22815;1010;0
22816;1010;0 22816;1010;0
22817;1010;0 22817;1010;1
22818;1010;0 22818;1010;1
22819;1010;0 22819;1010;1
22820;1010;0 22820;1010;1
22821;1010;0 22821;1010;1
22822;1010;0 22822;1010;1
22823;1010;0 22823;1010;1
22824;1010;0 22824;1010;1
22825;1010;0 22825;1010;0
22826;1010;0 22826;1010;0
22827;1010;0 22827;1010;0
@@ -22833,7 +22833,7 @@ time;:root:G:total_po_number;:root:P_R:waiting_po_number
22831;1010;0 22831;1010;0
22832;1010;0 22832;1010;0
22833;1010;0 22833;1010;0
22834;1010;0 22834;1010;1
22835;1010;0 22835;1010;0
22836;1010;0 22836;1010;0
22837;1010;0 22837;1010;0
@@ -23260,26 +23260,26 @@ time;:root:G:total_po_number;:root:P_R:waiting_po_number
23258;1030;1 23258;1030;1
23259;1030;1 23259;1030;1
23260;1030;1 23260;1030;1
23261;1030;0 23261;1030;1
23262;1030;0 23262;1030;1
23263;1030;0 23263;1030;1
23264;1030;0 23264;1030;1
23265;1030;0 23265;1030;1
23266;1030;0 23266;1030;1
23267;1030;0 23267;1030;1
23268;1030;0 23268;1030;0
23269;1031;0 23269;1031;0
23270;1031;0 23270;1031;0
23271;1031;1 23271;1031;0
23272;1031;1 23272;1031;0
23273;1031;1 23273;1031;0
23274;1031;1 23274;1031;0
23275;1031;1 23275;1031;0
23276;1031;1 23276;1031;0
23277;1031;1 23277;1031;0
23278;1031;1 23278;1031;0
23279;1031;1 23279;1031;0
23280;1031;1 23280;1031;0
23281;1031;0 23281;1031;0
23282;1031;0 23282;1031;0
23283;1031;0 23283;1031;0
@@ -23290,10 +23290,10 @@ time;:root:G:total_po_number;:root:P_R:waiting_po_number
23288;1031;0 23288;1031;0
23289;1031;0 23289;1031;0
23290;1031;0 23290;1031;0
23291;1031;1 23291;1031;0
23292;1031;1 23292;1031;0
23293;1031;1 23293;1031;0
23294;1032;1 23294;1032;0
23295;1032;0 23295;1032;0
23296;1032;0 23296;1032;0
23297;1032;0 23297;1032;0
@@ -23307,10 +23307,10 @@ time;:root:G:total_po_number;:root:P_R:waiting_po_number
23305;1032;1 23305;1032;1
23306;1032;1 23306;1032;1
23307;1032;1 23307;1032;1
23308;1032;1 23308;1032;0
23309;1032;1 23309;1032;0
23310;1033;1 23310;1033;0
23311;1033;1 23311;1033;0
23312;1033;0 23312;1033;0
23313;1033;0 23313;1033;0
23314;1033;0 23314;1033;0
@@ -24173,13 +24173,13 @@ time;:root:G:total_po_number;:root:P_R:waiting_po_number
24171;1070;0 24171;1070;0
24172;1070;0 24172;1070;0
24173;1070;0 24173;1070;0
24174;1070;1 24174;1070;0
24175;1070;1 24175;1070;0
24176;1070;1 24176;1070;0
24177;1071;1 24177;1071;0
24178;1071;1 24178;1071;0
24179;1071;1 24179;1071;0
24180;1071;1 24180;1071;0
24181;1071;0 24181;1071;0
24182;1071;0 24182;1071;0
24183;1071;0 24183;1071;0
@@ -24192,18 +24192,18 @@ time;:root:G:total_po_number;:root:P_R:waiting_po_number
24190;1071;0 24190;1071;0
24191;1071;0 24191;1071;0
24192;1071;0 24192;1071;0
24193;1072;0 24193;1072;1
24194;1072;0 24194;1072;1
24195;1072;0 24195;1072;1
24196;1072;0 24196;1072;1
24197;1072;0 24197;1072;1
24198;1072;1 24198;1072;1
24199;1072;1 24199;1072;1
24200;1072;1 24200;1072;1
24201;1072;1 24201;1072;1
24202;1072;1 24202;1072;1
24203;1072;1 24203;1072;0
24204;1072;1 24204;1072;0
24205;1072;0 24205;1072;0
24206;1072;0 24206;1072;0
24207;1072;0 24207;1072;0
@@ -24214,16 +24214,16 @@ time;:root:G:total_po_number;:root:P_R:waiting_po_number
24212;1073;1 24212;1073;1
24213;1073;1 24213;1073;1
24214;1073;1 24214;1073;1
24215;1073;2 24215;1073;1
24216;1073;1 24216;1073;0
24217;1073;1 24217;1073;0
24218;1073;1 24218;1073;0
24219;1073;1 24219;1073;0
24220;1073;1 24220;1073;0
24221;1073;1 24221;1073;0
24222;1073;1 24222;1073;0
24223;1073;1 24223;1073;0
24224;1073;1 24224;1073;0
24225;1073;1 24225;1073;1
24226;1074;1 24226;1074;1
24227;1074;1 24227;1074;1
1 time :root:G:total_po_number :root:P_R:waiting_po_number
2498 2496 109 0
2499 2497 109 0
2500 2498 109 0
2501 2499 109 0 1
2502 2500 110 0 1
2503 2501 110 0 1
2504 2502 110 0 1
2505 2503 110 0 1
2506 2504 110 0
2507 2505 110 0
2508 2506 110 0
2515 2513 110 1
2516 2514 110 1
2517 2515 110 1
2518 2516 110 0 1
2519 2517 110 0 1
2520 2518 110 0 1
2521 2519 110 0 1
2522 2520 110 0 1
2523 2521 110 0
2524 2522 110 0
2525 2523 110 0
2800 2798 123 0
2801 2799 123 0
2802 2800 123 0
2803 2801 123 0 1
2804 2802 123 0 1
2805 2803 123 0 1
2806 2804 123 0 1
2807 2805 123 0 1
2808 2806 123 0 1
2809 2807 123 0 1
2810 2808 123 0 1
2811 2809 123 0 1
2812 2810 123 0 1
2813 2811 123 0 1
2814 2812 123 0 1
2815 2813 123 1
2816 2814 123 0
2817 2815 123 0
22771 22769 1007 0
22772 22770 1007 0
22773 22771 1007 0
22774 22772 1008 0 1
22775 22773 1008 0 1
22776 22774 1008 0 1
22777 22775 1008 0 1
22778 22776 1008 0 1
22779 22777 1008 0 1
22780 22778 1008 0 1
22781 22779 1008 0 1
22782 22780 1008 0 1
22783 22781 1008 0 1
22784 22782 1008 0 1
22785 22783 1008 1
22786 22784 1008 1
22787 22785 1008 1
22788 22786 1008 1
22789 22787 1008 1
22790 22788 1008 1 0
22791 22789 1008 0
22792 22790 1008 0
22793 22791 1008 0
22804 22802 1009 1
22805 22803 1009 1
22806 22804 1009 1
22807 22805 1009 1 0
22808 22806 1009 0
22809 22807 1009 0
22810 22808 1009 0
22816 22814 1009 0
22817 22815 1010 0
22818 22816 1010 0
22819 22817 1010 0 1
22820 22818 1010 0 1
22821 22819 1010 0 1
22822 22820 1010 0 1
22823 22821 1010 0 1
22824 22822 1010 0 1
22825 22823 1010 0 1
22826 22824 1010 0 1
22827 22825 1010 0
22828 22826 1010 0
22829 22827 1010 0
22833 22831 1010 0
22834 22832 1010 0
22835 22833 1010 0
22836 22834 1010 0 1
22837 22835 1010 0
22838 22836 1010 0
22839 22837 1010 0
23260 23258 1030 1
23261 23259 1030 1
23262 23260 1030 1
23263 23261 1030 0 1
23264 23262 1030 0 1
23265 23263 1030 0 1
23266 23264 1030 0 1
23267 23265 1030 0 1
23268 23266 1030 0 1
23269 23267 1030 0 1
23270 23268 1030 0
23271 23269 1031 0
23272 23270 1031 0
23273 23271 1031 1 0
23274 23272 1031 1 0
23275 23273 1031 1 0
23276 23274 1031 1 0
23277 23275 1031 1 0
23278 23276 1031 1 0
23279 23277 1031 1 0
23280 23278 1031 1 0
23281 23279 1031 1 0
23282 23280 1031 1 0
23283 23281 1031 0
23284 23282 1031 0
23285 23283 1031 0
23290 23288 1031 0
23291 23289 1031 0
23292 23290 1031 0
23293 23291 1031 1 0
23294 23292 1031 1 0
23295 23293 1031 1 0
23296 23294 1032 1 0
23297 23295 1032 0
23298 23296 1032 0
23299 23297 1032 0
23307 23305 1032 1
23308 23306 1032 1
23309 23307 1032 1
23310 23308 1032 1 0
23311 23309 1032 1 0
23312 23310 1033 1 0
23313 23311 1033 1 0
23314 23312 1033 0
23315 23313 1033 0
23316 23314 1033 0
24173 24171 1070 0
24174 24172 1070 0
24175 24173 1070 0
24176 24174 1070 1 0
24177 24175 1070 1 0
24178 24176 1070 1 0
24179 24177 1071 1 0
24180 24178 1071 1 0
24181 24179 1071 1 0
24182 24180 1071 1 0
24183 24181 1071 0
24184 24182 1071 0
24185 24183 1071 0
24192 24190 1071 0
24193 24191 1071 0
24194 24192 1071 0
24195 24193 1072 0 1
24196 24194 1072 0 1
24197 24195 1072 0 1
24198 24196 1072 0 1
24199 24197 1072 0 1
24200 24198 1072 1
24201 24199 1072 1
24202 24200 1072 1
24203 24201 1072 1
24204 24202 1072 1
24205 24203 1072 1 0
24206 24204 1072 1 0
24207 24205 1072 0
24208 24206 1072 0
24209 24207 1072 0
24214 24212 1073 1
24215 24213 1073 1
24216 24214 1073 1
24217 24215 1073 2 1
24218 24216 1073 1 0
24219 24217 1073 1 0
24220 24218 1073 1 0
24221 24219 1073 1 0
24222 24220 1073 1 0
24223 24221 1073 1 0
24224 24222 1073 1 0
24225 24223 1073 1 0
24226 24224 1073 1 0
24227 24225 1073 1
24228 24226 1074 1
24229 24227 1074 1

BIN
test/test_json
View File

Binary file not shown.

BIN
test/test_simple
View File

Binary file not shown.