シミュレータで状態の計算を正しくできていない場合があったのを修正． #135

Merged k-sakoda merged 4 commits into nitta-lab:dynamicResourceCreation from nitta-lab:simulatorBugFix2 on 26 Dec

Patch

Unified Split

Showing 8 changed files

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          AlgebraicDataflowArchitectureModel/models/NemophilaAccounts.model
 	out accounts.{sendId}.requesting(sendRequesting:Map, sync1(recvId:Str, sendRequested:Map, recvRequesting:Map, sendFriends:Map)) = if(contains(sendFriends:Map, recvId) == true,
																																		sendRequesting,
																																		insert(sendRequesting:Map, recvId:Str, true))
	out accounts.{recvId}.requested(recvRequested:Map, sync1(recvId:Str, sendRequested:Map, recvRequesting:Map, sendFriends:Map)) = if(ontains(sendFriends:Map, recvId) == true,
	out accounts.{recvId}.requested(recvRequested:Map, sync1(recvId:Str, sendRequested:Map, recvRequesting:Map, sendFriends:Map)) = if(contains(sendFriends:Map, recvId) == true,
																																		recvRequested,
																																		insert(recvRequested:Map, sendId:Str, true))
}
 	out accounts.{sendId}.requesting(sendRequesting:Map, sync1(recvId:Str, sendRequested:Map, recvRequesting:Map, sendFriends:Map)) = if(contains(sendFriends:Map, recvId) == true,
 																																		sendRequesting,
 																																		insert(sendRequesting:Map, recvId:Str, true))
+	out accounts.{recvId}.requested(recvRequested:Map, sync1(recvId:Str, sendRequested:Map, recvRequesting:Map, sendFriends:Map)) = if(ontains(sendFriends:Map, recvId) == true,
+	out accounts.{recvId}.requested(recvRequested:Map, sync1(recvId:Str, sendRequested:Map, recvRequesting:Map, sendFriends:Map)) = if(contains(sendFriends:Map, recvId) == true,
 																																		recvRequested,
 																																		insert(recvRequested:Map, sendId:Str, true))
 }

                Ignore Space
               Show notes
              View
            
          
          4 ■■■■■
          AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
 									if (((Variable) param).getType() == null) {
										((Variable) param).setType(var.getType());
									}
								}
								params.add(param.toImplementation(null));
								params.add(param.toImplementation(new String[] {""}));
							} else {
								params.add(var.getName());
							}
						}
								args.add(((Variable)((Term) resExp).getChild(1)).getName());
							}
							resExp = ((Term) resExp).getChild(0);
						}
						String resourceAccess = resExp.toImplementation(new String[] {null});
						String resourceAccess = resExp.toImplementation(new String[] {""});
						// Values of channel parameters.
						for (Selector selector: ch.getAllSelectors()) {
							if (selector.getExpression() instanceof Variable) {
								Variable selVar = (Variable) selector.getExpression();
 									if (((Variable) param).getType() == null) {
 										((Variable) param).setType(var.getType());
 									}
 								}
+								params.add(param.toImplementation(null));
+								params.add(param.toImplementation(new String[] {""}));
 							} else {
 								params.add(var.getName());
 							}
 						}
 								args.add(((Variable)((Term) resExp).getChild(1)).getName());
 							}
 							resExp = ((Term) resExp).getChild(0);
 						}
+						String resourceAccess = resExp.toImplementation(new String[] {null});
+						String resourceAccess = resExp.toImplementation(new String[] {""});
 						// Values of channel parameters.
 						for (Selector selector: ch.getAllSelectors()) {
 							if (selector.getExpression() instanceof Variable) {
 								Variable selVar = (Variable) selector.getExpression();

                Ignore Space
               Show notes
              View
            
          
          4 ■■■■■
          AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
 													}
												}
												v++;
											}
											String ifStatement = "if (" + conditions.toImplementation(new String[] {})+ ") {\n";
											String ifStatement = "if (" + conditions.toImplementation(new String[] {""})+ ") {\n";
											update.addFirstStatement(ifStatement + "\t" + updateStatement.replace("\n", "\n\t") + "\n}");
										}
									}
									if (resToCh.getDestination().getIndegree() > 1
											composer.setType(DataConstraintModel.typeMap);
											composerSub = composer;
										}
										composer.setType(stateGetter.getReturnType());
										String[] sideEffects = new String[] {null};
										String[] sideEffects = new String[] {""};
										String returnValue = composer.toImplementation(sideEffects);
										if (sideEffects[0] != null) {
											stateGetter.addStatement(sideEffects[0] + "return " + returnValue+ ";");
										} else {
 													}
 												}
 												v++;
 											}
+											String ifStatement = "if (" + conditions.toImplementation(new String[] {})+ ") {\n";
+											String ifStatement = "if (" + conditions.toImplementation(new String[] {""})+ ") {\n";
 											update.addFirstStatement(ifStatement + "\t" + updateStatement.replace("\n", "\n\t") + "\n}");
 										}
 									}
 									if (resToCh.getDestination().getIndegree() > 1
 											composer.setType(DataConstraintModel.typeMap);
 											composerSub = composer;
 										}
 										composer.setType(stateGetter.getReturnType());
+										String[] sideEffects = new String[] {null};
+										String[] sideEffects = new String[] {""};
 										String returnValue = composer.toImplementation(sideEffects);
 										if (sideEffects[0] != null) {
 											stateGetter.addStatement(sideEffects[0] + "return " + returnValue+ ";");
 										} else {

                Ignore Space
               Show notes
              View
            
          
          6 ■■■■■
          AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
 													}
												}
												v++;
											}
											String ifStatement = "if (" + conditions.toImplementation(new String[] {})+ ") {\n";
											String ifStatement = "if (" + conditions.toImplementation(new String[] {""})+ ") {\n";
											update.addFirstStatement(ifStatement + "\t" + updateStatement.replace("\n", "\n\t") + "\n}");
										}
									}
									// Calculate in-degree of the destination resource.
													delimiter = ", ";
												}
												resExp = ((Term) resExp).getChild(0);
											}
											String resourceAccess = resExp.toImplementation(new String[] {null});
											String resourceAccess = resExp.toImplementation(new String[] {""});
											int v = 0;
											for (VariableDeclaration var: update2.getParameters()) {
												if (v < out.getResource().getPathParams().size()) {
													args += delimiter + ((Variable) out.getResource().getPathParams().get(v)).getName();
											delimiter = ", ";
										}
										resExp = ((Term) resExp).getChild(0);
									}
									String resourceAccess = resExp.toImplementation(new String[] {null});
									String resourceAccess = resExp.toImplementation(new String[] {""});
									// Values of channel parameters.
									for (Selector selector: ch.getAllSelectors()) {
										if (selector.getExpression() instanceof Variable) {
											Variable selVar = (Variable) selector.getExpression();
 													}
 												}
 												v++;
 											}
+											String ifStatement = "if (" + conditions.toImplementation(new String[] {})+ ") {\n";
+											String ifStatement = "if (" + conditions.toImplementation(new String[] {""})+ ") {\n";
 											update.addFirstStatement(ifStatement + "\t" + updateStatement.replace("\n", "\n\t") + "\n}");
 										}
 									}
 									// Calculate in-degree of the destination resource.
 													delimiter = ", ";
 												}
 												resExp = ((Term) resExp).getChild(0);
 											}
+											String resourceAccess = resExp.toImplementation(new String[] {null});
+											String resourceAccess = resExp.toImplementation(new String[] {""});
 											int v = 0;
 											for (VariableDeclaration var: update2.getParameters()) {
 												if (v < out.getResource().getPathParams().size()) {
 													args += delimiter + ((Variable) out.getResource().getPathParams().get(v)).getName();
 											delimiter = ", ";
 										}
 										resExp = ((Term) resExp).getChild(0);
 									}
+									String resourceAccess = resExp.toImplementation(new String[] {null});
+									String resourceAccess = resExp.toImplementation(new String[] {""});
 									// Values of channel parameters.
 									for (Selector selector: ch.getAllSelectors()) {
 										if (selector.getExpression() instanceof Variable) {
 											Variable selVar = (Variable) selector.getExpression();

                Ignore Space
               Show notes
              View
            
          
          6 ■■■■■
          AlgebraicDataflowArchitectureModel/src/models/algebra/Field.java
 		super(name);
	}
	
	public Field(String name, Type type) {
		super(name, type);
		super(name);
		symbol.setSignature(new Type[] {type});
	}
	
	public Field(Symbol symbol) {
		super(symbol);
	}
	
	public Type getType() {
		if (symbol.getSignature().length >= 1) {
		if (symbol.getSignature() != null && symbol.getSignature().length >= 1) {
			return symbol.getSignature()[0];
		}
		return null;
	}
 		super(name);
 	}
 	public Field(String name, Type type) {
+		super(name, type);
+		super(name);
+		symbol.setSignature(new Type[] {type});
 	}
 	public Field(Symbol symbol) {
 		super(symbol);
 	}
 	public Type getType() {
+		if (symbol.getSignature().length >= 1) {
+		if (symbol.getSignature() != null && symbol.getSignature().length >= 1) {
 			return symbol.getSignature()[0];
 		}
 		return null;
 	}

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/models/algebra/Parameter.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/SystemState.java