Outside_looporder

.github/workflows/c-cpp.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, outside_looporder ]
   workflow_dispatch:
     inputs:
       logLevel:

.github/workflows/outside.yml

@@ -0,0 +1,34 @@
+name: test outside injection
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master, outside_looporder ]
+  workflow_dispatch:
+    inputs:
+      logLevel:
+        description: 'Log level'
+        required: true
+        default: 'warning'
+      tags:
+        description: 'Test scenario tags'
+
+jobs:
+  gapc_ubuntu:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Update apt
+      run: sudo apt-get update
+    - name: Install dependencies
+      run: sudo apt-get install flex bison make libboost-all-dev libgsl-dev python3 python3-pip
+
+    - name: Checkout truth
+      run: git clone --branch master https://github.com/jlab/gapc-test-suite.git $GITHUB_WORKSPACE/../gapc-test-suite
+
+    - uses: actions/checkout@v2
+    - name: configure
+      run: ./configure --prefix $GITHUB_WORKSPACE
+
+    - name: test-mod
+      run: make -j 2 test-mod_outside TRUTH_DIR=$GITHUB_WORKSPACE/../gapc-test-suite/Truth TRUTH_SUFFIX=_ubuntu

Makefile

@@ -128,7 +128,7 @@ gapc: src/gapc.o $(MAIN_OBJ) src/version.o src/prefix.o
 
 stats \
 test_rt_tab \
-multi_cyk multi_deps multi_indices multi_list_size multi_eliminate_lists_more multi_eliminate_lists multi_algebra multi_signature multi_rt_approx multi_rt_all multi_in_out multi_self_rec multi_calls multi_table_dim multi_max_filter multi_loops multi_ys parser: src/version.o src/prefix.o
+multi_cyk multi_deps multi_indices multi_list_size multi_eliminate_lists_more multi_eliminate_lists multi_algebra multi_signature multi_rt_approx multi_rt_all multi_in_out multi_self_rec multi_calls multi_table_dim multi_max_filter multi_loops multi_ys multi_print_grammar outside_resolve_blocks outside_indices parser: src/version.o src/prefix.o
 
 backtrack: src/version.o
 
@@ -283,11 +283,13 @@ testdata/unittest/%: testdata/unittest/%.o
 
 # modtest
 
-MODTESTS_CXX:= $(wildcard testdata/modtest/*.cc)
+MODTESTS_CXX:= $(wildcard testdata/modtest/multi*.cc)
+MODOUTSIDETESTS_CXX:= $(wildcard testdata/modtest/outside*.cc)
 
 MODTESTS:=$(sort $(subst testdata/modtest/,,$(MODTESTS_CXX:.cc=)))
+MODOUTSIDETESTS:=$(sort $(subst testdata/modtest/,,$(MODOUTSIDETESTS_CXX:.cc=)))
 modtests: $(MODTESTS)
-
+outsidetests: $(MODOUTSIDETESTS)
 
 # paraltest
 
@@ -307,6 +309,10 @@ test-mod: modtests
 	cd testdata/modtest &&\
 	$(SHELL) run.sh $(TRUTH_DIR)/Mod$(TRUTH_SUFFIX) $(MODTESTS)
 
+test-mod_outside: outsidetests
+	cd testdata/modtest &&\
+	$(SHELL) run_outside.sh $(TRUTH_DIR)/Mod$(TRUTH_SUFFIX) $(MODOUTSIDETESTS)
+
 gen-mod: modtests
 	cd testdata/modtest &&\
 	  $(SHELL) gen.sh $(TRUTH_DIR)/Mod$(TRUTH_SUFFIX) $(MODTESTS)

rtlib/filter.hh

@@ -127,5 +127,10 @@ inline bool samesize(const Basic_Sequence<a1, pos_type> &s1,
   return j1-i1 == j2-i2;
 }
 
+template<typename alphabet, typename pos_type, typename T>
+inline bool complete_track(
+    const Basic_Sequence<alphabet, pos_type> &seq, T i, T j) {
+  return ((i == seq.n) && (j == seq.n));
+}
 
 #endif  // RTLIB_FILTER_HH_

rtlib/generic_main.cc

@@ -93,8 +93,12 @@ int main(int argc, char **argv) {
 
   gapc::add_event("end_computation");
 
+#ifndef OUTSIDE
   std::cout << "Answer: \n";
   obj.print_result(std::cout, res);
+#else
+  obj.report_insideoutside(std::cout);
+#endif
 
   gapc::add_event("end_result_pp");