WIP: Integrate changes for IBeX v2 - HiPE stateless (v2)

org.emoflon.ibex.gt.hipe/META-INF/MANIFEST.MF

@@ -18,15 +18,13 @@ Require-Bundle: net.sourceforge.plantuml.eclipse;bundle-version="1.1.24",
  hipe.searchplan;bundle-version="1.0.0",
  org.moflon.core.utilities,
  org.emoflon.ibex.common,
- org.emoflon.ibex.gt.editor.ui,
  org.moflon.core.plugins,
  org.moflon.core.ui,
  org.emoflon.ibex.gt,
- org.emoflon.ibex.patternmodel,
- org.emoflon.ibex.tgg.runtime;visibility:=reexport,
- org.emoflon.smartemf;bundle-version="1.0.0"
+ org.emoflon.smartemf,
+ org.emoflon.ibex.gt.gtmodel
 Automatic-Module-Name: org.emoflon.ibex.gt.democles
 Bundle-RequiredExecutionEnvironment: JavaSE-21
-Export-Package: org.emoflon.ibex.gt.hipe.ide.codegen,
- org.emoflon.ibex.gt.hipe.runtime,
+Export-Package: org.emoflon.ibex.gt.build.hipe,
+ org.emoflon.ibex.gt.engine.hipe,
  org.emoflon.ibex.gt.hipe.visualization

org.emoflon.ibex.gt.hipe/plugin.xml

@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-  <extension point="org.emoflon.ibex.gt.GTEngineExtension">
-    <engine_extension class="org.emoflon.ibex.gt.hipe.ide.codegen.GTHiPEExtension"/>
-  </extension>
-  <extension
-        point="org.emoflon.ibex.gt.GTEngineBuilderExtension">
-     <builder_extension
-           class="org.emoflon.ibex.gt.hipe.ide.codegen.GTHiPEBuilderExtension">
-     </builder_extension>
-  </extension>
   <extension
         point="org.moflon.core.ui.DiagramTextProvider">
      <diagram_text_provider
@@ -22,6 +13,19 @@
            class="org.emoflon.ibex.gt.hipe.visualization.HiPEPatternModelVisualiser">
      </diagram_text_provider>
   </extension>
+  <extension
+        point="org.emoflon.ibex.common.IBeXPMEngineExtension">
+     <engine_extension
+           engine_extension="org.emoflon.ibex.gt.engine.hipe.HiPEPatternMatchingEngine"
+           engine_information="org.emoflon.ibex.gt.engine.hipe.GTHiPEExtension">
+     </engine_extension>
+  </extension>
+  <extension
+        point="org.emoflon.ibex.gt.IBeXGTEngineBuilderExtension">
+     <builder_extension
+           class="org.emoflon.ibex.gt.build.hipe.GTHiPEBuilderExtension">
+     </builder_extension>
+  </extension>
 
 
 </plugin>

org.emoflon.ibex.gt.hipe/src/org/emoflon/ibex/gt/hipe/ide/codegen/GTHiPEBuilderExtension.java → org.emoflon.ibex.gt.hipe/src/org/emoflon/ibex/gt/build/hipe/GTHiPEBuilderExtension.java

@@ -1,4 +1,4 @@
-package org.emoflon.ibex.gt.hipe.ide.codegen;
+package org.emoflon.ibex.gt.build.hipe;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +10,6 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
@@ -21,10 +20,8 @@
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
 import org.emoflon.ibex.common.project.BuildPropertiesHelper;
 import org.emoflon.ibex.common.project.ManifestHelper;
-import org.emoflon.ibex.gt.codegen.GTEngineBuilderExtension;
-import org.emoflon.ibex.gt.hipe.runtime.IBeXToHiPEPatternTransformation;
-import org.emoflon.ibex.patternmodel.IBeXPatternModel.IBeXModel;
-import org.emoflon.ibex.patternmodel.IBeXPatternModel.IBeXPatternSet;
+import org.emoflon.ibex.gt.build.IBeXGTEngineBuilderExtension;
+import org.emoflon.ibex.gt.gtmodel.IBeXGTModel.GTModel;
 import org.moflon.core.plugins.manifest.ManifestFileUpdater;
 import org.moflon.core.utilities.ClasspathUtil;
 import org.moflon.core.utilities.LogUtils;
@@ -34,27 +31,27 @@
 import hipe.network.HiPENetwork;
 import hipe.pattern.HiPEContainer;
 import hipe.searchplan.SearchPlan;
+import hipe.searchplan.simple.StatelessSearchPlan;
 import hipe.searchplan.simple.TriangleSearchPlan;
 
-public class GTHiPEBuilderExtension implements GTEngineBuilderExtension{
+public class GTHiPEBuilderExtension implements IBeXGTEngineBuilderExtension {
 
 	public static final String BUILDER_ID = "org.emoflon.ibex.gt.editor.ui.hipe.builder";
 	private static Logger logger = Logger.getLogger(GTHiPEBuilderExtension.class);
-	
+
 	private String packageName;
+	private String packagePath;
 	private String projectPath;
 
 	@Override
-	public void run(IProject project, IPath packagePath, IBeXModel ibexModel) {
-		LogUtils.info(logger, "## HiPE ## Generating HiPE-Engine code..");	
+	public void run(IProject project, GTModel ibexModel) {
+		LogUtils.info(logger, "## HiPE ## Generating HiPE-Engine code..");
 		double tic = System.currentTimeMillis();
-
-		packageName = packagePath.toString().replace("/", ".");
 
-		IBeXPatternSet ibexPatterns = ibexModel.getPatternSet();
-
-		projectPath = project.getLocation().toPortableString();
-		
+		packageName = ibexModel.getMetaData().getPackage();
+		projectPath = ibexModel.getMetaData().getProjectPath();
+		packagePath = projectPath + "/" + ibexModel.getMetaData().getPackagePath();
+
 		LogUtils.info(logger, "Cleaning old code..");
 		cleanOldCode();
 
@@ -67,28 +64,30 @@ public void run(IProject project, IPath packagePath, IBeXModel ibexModel) {
 		} catch (CoreException e1) {
 			LogUtils.error(logger, e1.getMessage());
 		}
-		
+
 		LogUtils.info(logger, "Converting IBeX to HiPE Patterns..");
 		IBeXToHiPEPatternTransformation transformation = new IBeXToHiPEPatternTransformation();
-		HiPEContainer container = transformation.transform(ibexPatterns);
-		
+		HiPEContainer container = transformation.transform(ibexModel);
+
 		LogUtils.info(logger, "Creating search plan & generating Rete network..");
-		SearchPlan searchPlan = new TriangleSearchPlan(container);
+		SearchPlan searchPlan = new StatelessSearchPlan(container);
+//		SearchPlan searchPlan = new TriangleSearchPlan(container);
 //		SearchPlan searchPlan = new SimpleSearchPlan(container);
 		searchPlan.generateSearchPlan();
 		HiPENetwork network = searchPlan.getNetwork();
-		
+
 		LogUtils.info(logger, "Generating Code..");
 		HiPEGeneratorConfig config = new HiPEGeneratorConfig();
-		HiPEGenerator.generateCode(packageName+".", projectPath, network, config);
-
+		config.setEnforcedBidirectionalRefs(true);
+		HiPEGenerator.generateCode(packageName + ".", projectPath, network, config);
+
 		double toc = System.currentTimeMillis();
-		LogUtils.info(logger, "Code generation completed in "+ (toc-tic)/1000.0 + " seconds.");	
-		
+		LogUtils.info(logger, "Code generation completed in " + (toc - tic) / 1000.0 + " seconds.");
+
 		LogUtils.info(logger, "Saving HiPE patterns and HiPE network..");
-		saveResource(container, projectPath + "/src-gen/" + packagePath.toString() +"/hipe/engine/hipe-patterns.xmi");
-		saveResource(network, projectPath + "/src-gen/" + packagePath.toString() +"/hipe/engine/hipe-network.xmi");
-		
+		saveResource(container, packagePath.replace("src", "src-gen") + "/hipe/engine/hipe-patterns.xmi");
+		saveResource(network, packagePath.replace("src", "src-gen") + "/hipe/engine/hipe-network.xmi");
+
 		LogUtils.info(logger, "Refreshing workspace and cleaning build ..");
 		try {
 			project.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_ONE, new NullProgressMonitor());
@@ -97,98 +96,100 @@ public void run(IProject project, IPath packagePath, IBeXModel ibexModel) {
 		}
 		LogUtils.info(logger, "## HiPE ## --> HiPE build complete!");
 	}
-	
+
 	private void updateManifest(IProject project) {
 		try {
 			IFile manifest = ManifestFileUpdater.getManifestFile(project);
 			ManifestHelper helper = new ManifestHelper();
 			helper.loadManifest(manifest);
 
-			File rawManifest = new File(projectPath+"/"+manifest.getFullPath().removeFirstSegments(1).toPortableString());
-
+			File rawManifest = new File(
+					projectPath + "/" + manifest.getFullPath().removeFirstSegments(1).toPortableString());
+
 			helper.updateManifest(rawManifest);
-			
+
 		} catch (CoreException | IOException e) {
-			LogUtils.error(logger, "Failed to update MANIFEST.MF \n"+e.getMessage());
+			LogUtils.error(logger, "Failed to update MANIFEST.MF \n" + e.getMessage());
 		}
 	}
-	
+
 	private void updateBuildProperties() {
-		File buildProps = new File(projectPath+"/build.properties");
+		File buildProps = new File(projectPath + "/build.properties");
 		BuildPropertiesHelper helper = new BuildPropertiesHelper();
 		try {
 			helper.loadProperties(buildProps);
-			
-			if(!helper.containsSection("source..")) {
+
+			if (!helper.containsSection("source..")) {
 				helper.appendSection("source..");
 			}
-			
-			if(!helper.sectionContainsContent("source..", "src-gen/")) {
+
+			if (!helper.sectionContainsContent("source..", "src-gen/")) {
 				helper.addContentToSection("source..", "src-gen/");
 			}
 
 			helper.updateProperties(buildProps);
-			
+
 		} catch (CoreException | IOException e) {
-			LogUtils.error(logger, "Failed to update build.properties \n"+e.getMessage());
+			LogUtils.error(logger, "Failed to update build.properties \n" + e.getMessage());
 		}
-		
+
 	}
-	
+
 	private static boolean deleteDirectory(File dir) {
-		File[] contents  = dir.listFiles();
-		if(contents != null) {
-			for(File file : contents) {
+		File[] contents = dir.listFiles();
+		if (contents != null) {
+			for (File file : contents) {
 				deleteDirectory(file);
 			}
 		}
 		return dir.delete();
 	}
-	
+
 	private static void createNewDirectory(String path) {
 		File dir = new File(path);
-		if(!dir.exists()) {
-			if(!dir.mkdir()) {
-				LogUtils.error(logger, "Directory in: "+path+" could not be created!");
-			}else {
-				LogUtils.info(logger, "--> Directory in: "+path+" created!");
+		if (!dir.exists()) {
+			if (!dir.mkdir()) {
+				LogUtils.error(logger, "Directory in: " + path + " could not be created!");
+			} else {
+				LogUtils.info(logger, "--> Directory in: " + path + " created!");
 			}
-		}else {
-			LogUtils.info(logger, "--> Directory already present in: "+path+", nothing to do.");
+		} else {
+			LogUtils.info(logger, "--> Directory already present in: " + path + ", nothing to do.");
 		}
 	}
-	
+
 	private void cleanOldCode() {
-		File dir = new File(projectPath+"/src-gen/" + packageName.replace(".", "//") + "/hipe");
-		if(dir.exists()) {
-			LogUtils.info(logger, "--> Cleaning old source files in root folder: "+projectPath+"/src-gen/" + packageName.replace(".", "//") + "/hipe");
-			if(!deleteDirectory(dir)) {
+		File dir = new File(projectPath + "/src-gen/" + packageName.replace(".", "//") + "/hipe");
+		if (dir.exists()) {
+			LogUtils.info(logger, "--> Cleaning old source files in root folder: " + projectPath + "/src-gen/"
+					+ packageName.replace(".", "//") + "/hipe");
+			if (!deleteDirectory(dir)) {
 				LogUtils.error(logger, "Folder couldn't be deleted!");
 			}
 		} else {
 			LogUtils.info(logger, "--> No previously generated code found, nothing to do!");
 		}
 	}
-	
+
 	public static void saveResource(EObject model, String path) {
 		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("*", new XMIResourceFactoryImpl());
 		ResourceSet rs = new ResourceSetImpl();
 		rs.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", new XMIResourceFactoryImpl());
-		
+
 		URI uri = URI.createFileURI(path);
 		Resource modelResource = rs.createResource(uri);
 		modelResource.getContents().add(model);
-		
-		Map<Object, Object> saveOptions = ((XMIResource)modelResource).getDefaultSaveOptions();
-		saveOptions.put(XMIResource.OPTION_ENCODING,"UTF-8");
+
+		Map<Object, Object> saveOptions = ((XMIResource) modelResource).getDefaultSaveOptions();
+		saveOptions.put(XMIResource.OPTION_ENCODING, "UTF-8");
 		saveOptions.put(XMIResource.OPTION_USE_XMI_TYPE, Boolean.TRUE);
-		saveOptions.put(XMIResource.OPTION_SAVE_TYPE_INFORMATION,Boolean.TRUE);
+		saveOptions.put(XMIResource.OPTION_SAVE_TYPE_INFORMATION, Boolean.TRUE);
 		saveOptions.put(XMIResource.OPTION_SCHEMA_LOCATION_IMPLEMENTATION, Boolean.TRUE);
-		
+
 		try {
-			((XMIResource)modelResource).save(saveOptions);
+			((XMIResource) modelResource).save(saveOptions);
 		} catch (IOException e) {
-			LogUtils.error(logger, "Couldn't save debug resource: \n "+e.getMessage());
+			LogUtils.error(logger, "Couldn't save debug resource: \n " + e.getMessage());
 		}
 	}